TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23128 commits 103 branches 35 tags 496 MiB
Commit graph

23128 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ludovic Courtès
8197c978ef utils: Change `substitute*' to allow iteration over several matches. 
* guix/build/utils.scm (substitute): Do not pass the OUT to PROC; use
  `list-matches' instead of `regexp-exec' and pass a list of matches to
  PROC. Expect PROC to return a string, and output that.  Fold over
  RX+PROC in order.  Use `(read-line p 'concat)' to include the trailing
  delimiter in LINE.
  (substitute*): Produce code to iterate over the matches, and return a
  string, which includes anything from the original line that's in
  between matches.

* distro/base.scm (gcc-4.7, glibc): Adjust accordingly: remove use
  of (ice-9 regex) and `regexp-substitute/global'; return a string.
 2012-09-01 19:21:31 +02:00
Ludovic Courtès
9dd036f35c distro: m4: Add patch to allow builds with glibc 2.16+. 
* distro/base.scm (m4): Use `m4-gets-undeclared.patch'.

* distro/patches/m4-gets-undeclared.patch: New file.
* Makefile.am (dist_patch_DATA): Add it.
 2012-09-01 11:52:52 +02:00
Ludovic Courtès
6dd7787c39 Add a guile-for-build' parameter to build-expression->derivation'. 
* guix/derivations.scm (%guile-for-build): Use `nixpkgs-derivation*'
  instead of `nixpkgs-derivation'.
  (build-expression->derivation): New `guile-for-build' keyword
  parameter.  Use it.
 2012-09-01 11:45:52 +02:00
Ludovic Courtès
4c1eddf766 Add an env-vars' keyword parameter to build-expression->derivation'. 
* guix/derivations.scm (build-expression->derivation): New `env-vars'
  keyword parameter; default to '().  Use it.
 2012-09-01 11:33:20 +02:00
Ludovic Courtès
dc4e02572e build-system/gnu: Add `path-exclusions' parameter. 
* guix/build/gnu-build-system.scm (set-paths): Add new `path-exclusions'
  parameter; honor it.
* guix/build-system/gnu.scm (gnu-build): New `path-exclusions' keyword
  parameter; pass it to BUILDER.

* distro/base.scm (gcc-4.7): Exclude "libc" from $LIBRARY_PATH.
 2012-09-01 01:14:31 +02:00
Ludovic Courtès
f1f100b297 distro: gcc: Allow `libstdc++' to be found. 
* distro/base.scm (gcc-4.7): Add `-rpath' arguments to `LIB_SPEC' to
  allow `libstdc++' to be found by users.
 2012-09-01 00:35:12 +02:00
Ludovic Courtès
6e0874db3d distro: gcc: Pass #:strip-binaries?. 
* distro/base.scm (gcc-4.7): Pass #:strip-binaries?.
 2012-09-01 00:33:23 +02:00
Ludovic Courtès
877217b85a build-system/gnu: Honor the patch-shebangs?' and strip-binaries?' parameters. 
* guix/build/gnu-build-system.scm (patch-shebangs): Honor
  PATCH-SHEBANGS?.
  (strip): Honor STRIP-BINARIES?.  Display a message from `strip-dir'.
 2012-08-31 23:58:21 +02:00
Ludovic Courtès
8759a648ba guix-build: Fix the "unrecognized option" error message. 
* guix-build.in (guix-build): Show the option name when an unrecognized
  option is passed.
 2012-08-31 17:05:34 +02:00
Ludovic Courtès
e815763e69 build-system/gnu: Add a `strip' phase. 
* guix/build/gnu-build-system.scm (strip): New procedure.
  (%standard-phases): Add it.

* guix/build-system/gnu.scm (gnu-build): New `strip-binaries?',
  `strip-flags', and `strip-directories' keyword parameters.  Pass them
  to BUILDER.
 2012-08-31 17:04:53 +02:00
Ludovic Courtès
84209975fd build-system/gnu: Always invoke `configure' with a relative path. 
* guix/build/gnu-build-system.scm (configure): Change SRCDIR to always
  be a relative path.
 2012-08-30 23:30:42 +02:00
Ludovic Courtès
a436d2018e distro: gcc: Do not store configure flags in the resulting binaries. 
* distro/base.scm (gcc-4.7): Add a `post-configure' phase to clear
  `TOPLEVEL_CONFIGURE_ARGUMENTS' in the top-level `Makefile'.
 2012-08-30 23:03:11 +02:00
Ludovic Courtès
dcd60f4398 define-record-type*: Add the `inherit' syntactic constructor keyword. 
* guix/utils.scm (define-record-type*)[make-syntactic-constructor]: New
  `type' parameter.  Add the `inherit' keyword and corresponding support
  code.

* tests/utils.scm ("define-record-type* & inherit", "define-record-type*
  & inherit & letrec* behavior"): New tests.
 2012-08-30 00:18:50 +02:00
Ludovic Courtès
c79dae6076 distro: Add missing Binutils patch. 
* distro/patches/binutils-ld-new-dtags.patch: New file.
* Makefile.am (dist_patch_DATA): Add it.
 2012-08-29 00:15:39 +02:00
Ludovic Courtès
7cdeac023d distro: Add the GNU C Library. 
* distro/base.scm (glibc): New variable.
 2012-08-28 23:15:13 +02:00
Ludovic Courtès
3db3913ebb distro: Add Linux headers. 
* distro/base.scm (linux-headers): New variable.
 2012-08-28 22:31:17 +02:00
Cyprien Nicolas (fulax)
73f9a978ef configure.ac: Make 'guild' configure check fatal, otherwise one gets 'compile: command not found' during make 2012-08-27 15:44:32 +02:00
Ludovic Courtès
8f6201a31f distro: Add GNU Binutils. 
* distro/base.scm (binutils): New variable.
 2012-08-25 13:12:47 +02:00
Ludovic Courtès
81e57ec5ff distro: Add GCC. 
* distro/base.scm (gcc-4.7): New variable.
 2012-08-25 13:12:47 +02:00
Ludovic Courtès
8773648e35 utils: Change `substitute*' to accept a list of files to patch. 
* guix/build/utils.scm (substitute*): Support a list of files as the
  first argument.
 2012-08-25 13:12:45 +02:00
Ludovic Courtès
22b5d9c9a5 build-system/gnu: Add `out-of-source?' keyword parameter. 
* guix/build/gnu-build-system.scm (configure): Add an `out-of-source?'
  keyword parameter; build out-of-source-tree when #t.
* guix/build-system/gnu.scm (gnu-build): Add `out-of-source?' keyword
  parameter.  Pass it in BUILDER.
 2012-08-23 23:13:41 +02:00
Ludovic Courtès
d36622dc44 packages: Raise an error condition upon invalid input. 
* guix/packages.scm (&package-error, &package-input-error): New
  condition types.
  (package-derivation): Raise a `&package-input-error' when no match is
  made.
 2012-08-23 23:09:13 +02:00
Ludovic Courtès
dfae21c8cc distro: coreutils: Remove erroneous hack. 
* distro/base.scm (coreutils)[arguments]: Remove
  "FORCE_UNSAFE_CONFIGURE" setting, since in fact, this is no problem
  when using Nix with separate build users.
 2012-08-23 00:17:14 +02:00
Ludovic Courtès
2c957cd244 distro: Add GNU Coreutils. 
* distro/base.scm (coreutils): New variable.
 2012-08-22 23:49:36 +02:00
Ludovic Courtès
24cf75b9ef distro: Add XZ. 
* distro/base.scm (xz): New variable.
 2012-08-22 23:32:39 +02:00
Ludovic Courtès
e0fb536aaf distro: Add GNU gzip. 
* distro/base.scm (gzip): New variable.
 2012-08-22 23:29:53 +02:00
Ludovic Courtès
fbeec3d9bd distro: Add GNU Patch. 
* distro/base.scm (patch): New variable.
 2012-08-22 23:18:32 +02:00
Ludovic Courtès
04a32ee5ea distro: Add GNU Diffutils. 
* distro/base.scm (diffutils): New variable.
 2012-08-22 23:11:31 +02:00
Ludovic Courtès
2dda7734ba build: Bump version number. 
* configure.ac: Switch to version 0.1.
 2012-08-22 17:25:47 +02:00
Ludovic Courtès
3abaf0c440 Add `close-connection'. 
* guix/store.scm (close-connection): New procedure.
 2012-08-22 17:25:47 +02:00
Ludovic Courtès
800cdeef31 distro: Move patches to their own directory. 
* Makefile.am (nobase_dist_guilemodule_DATA): Keep only $(MODULES).
  (patchdir): New variable.
  (dist_patch_DATA): New variable.  Patch files formerly
  in $(nobase_dist_guilemodule_DATA).
  (.scm.go): Define `DISTRO_PATCH_DIRECTORY' and
  `DISTRO_INSTALLED_PATCH_DIRECTORY'.
  (TESTS_ENVIRONMENT): Define `DISTRO_PATCH_DIRECTORY'.

* distro.scm (%patch-directory): New variable.
  (search-patch): New procedure.
* distro/base.scm: Use `search-patch' instead of `(search-path
  %load-path ...)'.

* distro/findutils-absolute-paths.patch, distro/guile-1.8-cpp-4.5.patch,
  distro/m4-readlink-EINVAL.patch, distro/m4-s_isdir.patch,
  distro/make-impure-dirs.patch: Move to `distro/patches'.
 2012-08-22 17:25:43 +02:00
Ludovic Courtès
af5521ca01 distro: Add GNU Findutils. 
* distro/base.scm (findutils): New variable.
* distro/findutils-absolute-paths.patch: New file.
* Makefile.am (nobase_dist_guilemodule_DATA): Add it.
 2012-08-22 15:51:17 +02:00
Ludovic Courtès
6794b278ce distro: Add GNU grep. 
* distro/base.scm (grep): New variable.
 2012-08-22 15:22:38 +02:00
Ludovic Courtès
852403224e distro: Add GNU tar. 
* distro/base.scm (tar): New variable.
 2012-08-22 15:21:50 +02:00
Ludovic Courtès
8dcad9aa9d distro: Add GNU sed. 
* distro/base.scm (sed): New variable.
 2012-08-22 15:11:12 +02:00
Ludovic Courtès
9350da0dac distro: Add GNU Bash. 
* distro/base.scm (bash): New variable.
 2012-08-21 18:23:51 +02:00
Ludovic Courtès
ab77686565 distro: Add GNU Make. 
* distro/base.scm (gnu-make): New variable.
* distro/make-impure-dirs.patch: New file.
* Makefile.am (nobase_dist_guilemodule_DATA): Add it.
 2012-08-21 18:14:57 +02:00
Ludovic Courtès
fc484f605c build-system/gnu: Augment $PATH with $out for `patch-shebangs'. 
* guix/build/gnu-build-system.scm (patch-shebangs): Add BINDIRS to
  $PATH, and pass that to `patch-shebang'.
 2012-08-19 23:05:04 +02:00
Ludovic Courtès
525a59d6d3 utils: Add a path' argument to patch-shebang'. 
* guix/build/utils.scm (patch-shebang): Add an optional `path'
  parameter.  Change SHEBANG-RX to match the whole interpreter file
  name.  Don't patch when BIN and CMD are the same.  Add docstring.
 2012-08-19 23:04:03 +02:00
Ludovic Courtès
54ba617e9f distro: gmp: Fix typo in URL. 
* distro/base.scm (gmp): Fix URL.
 2012-08-19 17:56:03 +02:00
Ludovic Courtès
437fd80992 build-system/gnu: Add a `patch-shebangs' phase. 
* guix/build/gnu-build-system.scm (patch-shebangs): New procedure.
  (%standard-phases): Add it.

* guix/build-system/gnu.scm (gnu-build): New `patch-shebangs?' keyword
  parameter.  Pass it to the builder's `gnu-build'.
 2012-08-19 17:54:54 +02:00
Ludovic Courtès
ebe2f31f19 utils: Add `patch-shebang'. 
* guix/build/utils.scm (search-path-as-string->list): New procedure.
  (dump-port, patch-shebang): New procedures.
 2012-08-19 17:41:30 +02:00
Ludovic Courtès
ad102c4683 release.nix: Add dependency on GNU libgcrypt. 
* release.nix (build)[configureFlags]: Add `--with-libgcrypt-prefix'.
 2012-08-17 10:45:49 +02:00
Ludovic Courtès
3a310cc017 build: Add `--with-libgcrypt-prefix'; capture the path to libgcrypt. 
* configure.ac: Add `--with-libgcrypt-prefix'.  Substitute `LIBGCRYPT'.

* Makefile.am (.scm.go): Pass $(LIBGCRYPT).

* guix/utils.scm (%libgcrypt): New variable.
  (sha256): Use it.
 2012-08-17 10:41:27 +02:00
Ludovic Courtès
93a0a8b3fd packages: Add all non-derivation paths to the store. 
* guix/packages.scm (package-derivation): Add all non-derivation paths
  to the store.
 2012-08-16 19:00:49 +02:00
Ludovic Courtès
cf56996046 packages: Allow store paths as inputs. 
* guix/packages.scm (package-derivation): Allow non-derivation store
  paths as inputs.
 2012-08-16 18:48:03 +02:00
Ludovic Courtès
10d8289861 release.nix: Build out of chroot. 
* release.nix: Add `preConfigure' and `__noChroot' attributes.
 2012-08-14 18:52:41 +02:00
Ludovic Courtès
437e0729d8 build: Pass the right flags for "make distcheck". 
* Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): New variable.
* configure.ac: Define and substitute `NIX_PREFIX'.
 2012-08-14 18:50:36 +02:00
Ludovic Courtès
d95c0113c9 build: Add `test.drv' to the distribution. 
* Makefile.am (EXTRA_DIST): Add `tests/test.drv'.
 2012-08-14 18:44:52 +02:00
Ludovic Courtès
b86b00567c build: Pass $(NIX_INSTANTIATE) to the build and test environments. 
* Makefile.am (.scm.go): Define $NIX_INSTANTIATE.
  (TESTS_ENVIRONMENT): Likewise, and define $NIX_HASH.
* guix/utils.scm (nixpkgs-derivation): Use $NIX_INSTANTIATE when
  defined.

* tests/utils.scm (%nix-hash): New variable.
  ("sha256 & bytevector->nix-base32-string"): Use it.
 2012-08-14 18:42:46 +02:00