diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-04-12 17:30:27 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-04-12 17:31:01 +0200 |
| commit | fe0cff14f6c5facee4192529f5c7b7a972f185ca (patch) | |
| tree | 6e8c21cbcb5a4b0656d2184940457fe87dd92095 /config-daemon.ac | |
| parent | d7c5d27795500c1db3bca6c2ebf9066e32d36adb (diff) | |
substitute-binary: Implement `--substitute'.
This allows build outputs to be transparently downloaded from
http://hydra.gnu.org, for example.
* config-daemon.ac: Check for `gzip', `bzip2', and `xz'.
* guix/config.scm.in (%gzip, %bzip2, %xz): New variable.
* guix/scripts/substitute-binary.scm (fetch): Return SIZE as a second value.
(<narinfo>): Change `url' to `uri'.
(make-narinfo): Rename to...
(narinfo-maker): ... this. Handle relative URLs.
(fetch-narinfo): Adjust accordingly.
(filtered-port, decompressed-port): New procedures.
(guix-substitute-binary): Implement the `--substitute' case.
* tests/store.scm ("substitute query"): Use (%store-prefix) instead
of (getenv "NIX_STORE_DIR").
("substitute"): New test.
Diffstat (limited to 'config-daemon.ac')
| -rw-r--r-- | config-daemon.ac | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config-daemon.ac b/config-daemon.ac index eed1e23f9e5..7c51f2b95c5 100644 --- a/config-daemon.ac +++ b/config-daemon.ac | |||
| @@ -11,6 +11,14 @@ if test "x$guix_build_daemon" = "xyes"; then | |||
| 11 | AC_PROG_RANLIB | 11 | AC_PROG_RANLIB |
| 12 | AC_CONFIG_HEADER([nix/config.h]) | 12 | AC_CONFIG_HEADER([nix/config.h]) |
| 13 | 13 | ||
| 14 | dnl Decompressors, for use by the substituter. | ||
| 15 | AC_PATH_PROG([GZIP], [gzip]) | ||
| 16 | AC_PATH_PROG([BZIP2], [bzip2]) | ||
| 17 | AC_PATH_PROG([XZ], [xz]) | ||
| 18 | AC_SUBST([GZIP]) | ||
| 19 | AC_SUBST([BZIP2]) | ||
| 20 | AC_SUBST([XZ]) | ||
| 21 | |||
| 14 | dnl Use 64-bit file system calls so that we can support files > 2 GiB. | 22 | dnl Use 64-bit file system calls so that we can support files > 2 GiB. |
| 15 | AC_SYS_LARGEFILE | 23 | AC_SYS_LARGEFILE |
| 16 | 24 | ||
