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

90602 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ludovic Courtès
683d57f420 distro: Fix bootstrapping regression recently introduced. 
* distro/packages/base.scm (gcc-boot0-wrapped): Fix typo introduced in
  a52e429f76 ("distro: Add i686 support.")
 2012-10-18 11:41:12 +02:00
Ludovic Courtès
f76a51add0 distro: Clear references to the store in static binaries. 
* distro/packages/base.scm (%static-binaries): Clear references to the
  store path for files in $out/bin.
 2012-10-17 23:34:05 +02:00
Ludovic Courtès
4c261f4169 utils: Add `find-files'. 
* guix/build/utils.scm (find-files): New procedure.
 2012-10-17 23:25:25 +02:00
Ludovic Courtès
c0746cc9db utils: Add `copy-recursively'; use it. 
* guix/build/utils.scm (copy-recursively): New procedure.

* distro/packages/base.scm (%guile-static-stripped): Use it.
 2012-10-17 23:25:25 +02:00
Ludovic Courtès
7da95264f1 utils: Add `mkdir-p'; use it. 
* guix/build/utils.scm (mkdir-p): New procedure.

* distro/packages/base.scm (gnu-make-boot0, gcc-boot0-wrapped,
  ld-wrapper-boot3, %static-binaries, %guile-static-stripped): Use it.
* distro/packages/typesetting.scm (lout): Likewise.
 2012-10-17 23:25:25 +02:00
Ludovic Courtès
7172116ca5 build-system/gnu: Pass the system type to the builder. 
* guix/build-system/gnu.scm (gnu-build)[builder]: Pass SYSTEM to
  `gnu-build' as a keyword argument.
 2012-10-17 23:25:25 +02:00
Nikita Karetnikov
a52e429f76 distro: Add i686 support. 
* distro/packages/base.scm (gcc-4.7): Turn `arguments' into a lambda.
  Use `glibc-dynamic-linker' instead of the hard-coded linker name.
 2012-10-17 23:25:25 +02:00
Ludovic Courtès
124b17673b distro: Switch to Linux-Libre. 
* distro/packages/base.scm (linux-headers): Rename to...
  (linux-libre-headers): ... this.  Change `name', `source', and
  `description', and `home-page' accordingly.  Update users.
  (linux-headers-boot0): Rename to...
  (linux-libre-headers-boot0): ... this.  Update users.
 2012-10-17 23:25:25 +02:00
Ludovic Courtès
ac5aa28889 distro: Use our own pre-built Guile to bootstrap. 
* distro/packages/base.scm (%bootstrap-guile): Build from a tarball
  containing a pre-built Guile.

* distro.scm (%bootstrap-binaries-directory): New variable.
  (search-bootstrap-binary): New procedure.

* Makefile.am (bootstrapdir, bootstrap_x86_64_linuxdir,
  dist_bootstrap_x86_64_linux_DATA, DISTCLEANFILES, DOWNLOAD_FILE): New
  variables.
  (distro/packages/bootstrap/x86_64-linux/guile-bootstrap-2.0.6.tar.xz):
  New rule.
  (EXTRA_DIST): Add `build-aux/download.scm'.
  (.scm.go): Define the `DISTRO_BOOTSTRAP_DIRECTORY' and
  `DISTRO_INSTALLED_BOOTSTRAP_DIRECTORY' environment variables.

* pre-inst-env.in: Define `DISTRO_BOOTSTRAP_DIRECTORY'.

* build-aux/download.scm: New file.
* distro/packages/bootstrap/x86_64-linux/{bash, mkdir, tar, xz}: New
  files.
 2012-10-17 23:25:25 +02:00
Ludovic Courtès
9735a7b6ea distro: Add package that builds a tarball of the bootstrap Guile. 
* distro/packages/base.scm (%guile-static-stripped): New variable.
 2012-10-17 23:25:25 +02:00
Ludovic Courtès
eb1db76e34 distro: Add patch to allow the bootstrap Guile to work without iconv. 
* distro/patches/guile-default-utf8.patch: New file.
* Makefile.am (dist_patch_DATA): Add it.

* distro/packages/base.scm (%guile-static): Use it.
  (%guile-static-stripped): Add call to `remove-store-references'.
 2012-10-17 23:25:25 +02:00
Ludovic Courtès
b7f280ee3e distro: Change relocatable-Guile patch to work around broken argv[0]. 
* distro/patches/guile-relocatable.patch: Change to use /proc/self/exe
  instead of PROGRAM_INVOCATION_NAME.  Useful because Nix itself passes
  just the basename of builders that it executes.
 2012-10-17 23:25:25 +02:00
Ludovic Courtès
9b9b6f3d51 build: Use `pre-inst-env' to run tests. 
* Makefile.am (TESTS_ENVIRONMENT): Remove.
  (LOG_COMPILER): Use `pre-inst-env'.
 2012-10-17 23:25:23 +02:00
Ludovic Courtès
8587b54268 release.nix: Add dependency on GNU Texinfo. 
* release.nix (tarball)[buildNativeInputs]: Add `texinfo'.
 2012-10-17 16:16:45 +02:00
Ludovic Courtès
91133c2d71 utils: Add fold-port-matches' and remove-store-references'. 
* guix/build/utils.scm (fold-port-matches, remove-store-references): New
  procedures.

* tests/build-utils.scm ("fold-port-matches", "fold-port-matches,
  trickier", "fold-port-matches, with unmatched chars"): New tests.
 2012-10-16 23:01:01 +02:00
Ludovic Courtès
dcd7290654 utils: Add `with-atomic-file-replacement'. 
* guix/build/utils.scm (with-atomic-file-replacement): New procedure.
  (substitute): Use it.
 2012-10-16 17:31:16 +02:00
Ludovic Courtès
df1fab5837 distro: Add a statically-linked, relocatable Guile 2.0 package. 
* distro/packages/base.scm (%guile-static, %guile-static-stripped): New
  variables.

* distro/patches/guile-relocatable.patch: New file.
* Makefile.am (dist_patch_DATA): Add it.
 2012-10-13 22:36:39 +02:00
Ludovic Courtès
4004f95379 ftp-client: Try all the addresses returned by `getaddrinfo'. 
* guix/ftp-client.scm (ftp-open): Upon connection failure, try the other
  addresses returned by `getaddrinfo'.
 2012-10-13 21:18:16 +02:00
Ludovic Courtès
568717fd90 doc: Add the stub of a manual. 
* doc/guix.texi: New file.
* doc/fdl-1.3.texi: New file, copied from Gnulib.

* Makefile.am (info_TEXINFOS): New variable.
  (EXTRA_DIST): Add `doc/fdl-1.3.texi'.
 2012-10-13 16:05:01 +02:00
Ludovic Courtès
e300a0f8d2 distro: Add missing bits from previous commit. 
* distro/packages/base.scm (default-keyword-arguments): New procedure.
 2012-10-11 00:32:17 +02:00
Ludovic Courtès
a3f75312ec distro: First stab at building statically-linked bootstrap binaries. 
* distro/packages/base.scm (static-package): New procedure.
  (%bash-static, %static-inputs, %static-binaries): New variables.
 2012-10-11 00:25:55 +02:00
Ludovic Courtès
ad8526466c Remove non-existent module from (guix). 
* guix.scm (%public-modules): Remove `snix', since that modules doesn't
  exist yet.
 2012-10-08 23:13:51 +02:00
Ludovic Courtès
e4588af969 packages: Fix and optimize memoization of `package-derivation'. 
* guix/packages.scm (%derivation-cache): Pass an initial size of 100.
  (cache): Use `hashq-set!', and use a SYSTEM/DRV pair as the value.
  (cached-derivation): Update accordingly.
 2012-10-08 22:07:19 +02:00
Ludovic Courtès
ead1f1086d packages: Micro-optimize `package-derivation'. 
* guix/packages.scm (package-derivation): Move `cache' call before the
  traversal of PACKAGE's inputs.
 2012-10-08 21:57:14 +02:00
Ludovic Courtès
df7bbd3813 derivations: Set input port to UTF-8 in `read-derivation'. 
* guix/derivations.scm (read-derivation): Set DRV-PORT's encoding to
  UTF-8.
 2012-10-07 22:28:07 +02:00
Ludovic Courtès
58ddf10ea3 Update the (guix) module. 
* guix.scm (%public-modules): Update list of current second-level
  modules.
 2012-10-07 22:26:55 +02:00
Ludovic Courtès
14da91e2f0 tests: Use bootstrap and Nixpkgs inputs to be less costly. 
* tests/builders.scm (%bootstrap-inputs, %bootstrap-guile): New
  variables.
  ("gnu-build"): Use them, by setting `#:implicit-inputs? #f' and `#:guile'.

* tests/packages.scm (%bootstrap-inputs, %bootstrap-guile): New
  variables.
  ("trivial"): Pass `#:guile %bootstrap-guile'.
  ("GNU Hello"): Use `package-with-explicit-inputs' to use
  %BOOTSTRAP-GUILE and %BOOTSTRAP-INPUTS.
 2012-10-07 22:24:59 +02:00
Ludovic Courtès
81c7948d9a build-system/{gnu,trivial-build}: Fix handling of #:guile argument. 
* guix/build-system/gnu.scm (gnu-build)[guile-for-build]: Check whether
  GUILE matches string? before checking whether it matches
  derivation-path?.
* guix/build-system/trivial.scm (trivial-build)[guile-for-build]:
  Likewise.
 2012-10-07 22:22:27 +02:00
Ludovic Courtès
2143cf7a50 distro: Specify use of the bootstrap Guile for the initial derivations. 
* distro/packages/base.scm (%bootstrap-guile): New variable.
  (gnu-make-boot0, diffutils-boot0, findutils-boot0, binutils-boot0,
  gcc-boot0, linux-headers-boot0, glibc-final, gcc-boot0-wrapped,
  gcc-final, ld-wrapper-boot3, bash-final, guile-final): Add
  `#:guile %bootstrap-guile' to the builder's arguments.
 2012-10-06 01:25:19 +02:00
Ludovic Courtès
12d5aa0f5a build-system/{gnu,trivial}: Add a `#:guile' keyword parameter. 
* guix/build-system/gnu.scm (package-with-explicit-inputs): New `guile'
  keyword parameter.  Add it to P's arguments, and pass it in recursive
  calls.
  (gnu-build): New `guile' keyword parameter; new `guile-for-build'
  variable.  Pass it as the `#:guile-for-build' parameter of
  `build-expression->derivation'.

* guix/build-system/trivial.scm (trivial-build): Likewise.
 2012-10-06 01:25:17 +02:00
Ludovic Courtès
db1a15314d Support build-cores = 0; change `guix-build' to default to 0. 
* guix/build/gnu-build-system.scm (%parallel-job-count): New variable.
  (build, check): Use it instead of $NIX_BUILD_CORES.

* guix-build.in (guix-build): Default to 0 for the #:build-cores option.
 2012-10-05 23:21:09 +02:00
Ludovic Courtès
7da7ae937e Augment `README'. 
* README (Hacking): Mention `--with-nixpkgs'.  List the autotools and
  Gettext, as suggested by Nikita Karetnikov <nikita.karetnikov@gmail.com>.
 2012-10-05 00:19:29 +02:00
Ludovic Courtès
49feac7a54 distro: Fix typo in warning message. 
* distro.scm (package-files): Add missing newline in warning message.
 2012-10-04 23:12:41 +02:00
Ludovic Courtès
f4544767b4 Add `pre-inst-env' script. 
* pre-inst-env.in: New file.
* configure.ac: Add it to `AC_CONFIG_FILES' and `AC_CONFIG_COMMANDS'.
 2012-10-04 23:12:15 +02:00
Ludovic Courtès
ab90f87c41 Fix and update `POTFILES.in'. 
* po/POTFILES.in: Update.
 2012-10-04 23:10:57 +02:00
Ludovic Courtès
75668d7916 distro: Add libgc. 
* distro/packages/base.scm (libgc): New variable.
  (guile-2.0): Use it.
 2012-09-26 23:17:39 +02:00
Ludovic Courtès
cb0d69ed16 distro: Add pkg-config. 
* distro/packages/base.scm (pkg-config): New variable.
  (guile-2.0): Use it.
* distro/packages/guile.scm (guile-reader): Likewise.
 2012-09-26 23:06:45 +02:00
Ludovic Courtès
1722d6800f distro: Add the guile', typesetting', and `databases' package modules. 
* distro.scm (package-files): Adjust PREFIX-LEN to use the top-level
  directory, not %DISTRO-MODULE-DIRECTORY.
* distro/packages/base.scm (guile-reader, guile-reader/guile-1.8,
  guile-reader/guile-2.0, lout, recutils): Move to...
* distro/packages/guile.scm, distro/packages/typesetting.scm,
  distro/packages/databases.scm: ... here.  New files.
* Makefile.am (MODULES): Add them.
  (EXTRA_DIST): Add `.dir-locals.el'.

* .dir-locals.el: New file, with settings formerly in `base.scm'.
 2012-09-26 23:00:36 +02:00
Ludovic Courtès
1f455fdca6 distro: Rename (distro ...) to (distro packages ...). 
* distro/base.scm, distro/ld-wrapper.scm: Move to `distro/packages'.
  Adjust LD-WRAPPER-BOOT3 input file name accordingly.
* Makefile.am (MODULES): Adjust accordingly.
* distro.scm (%distro-module-directory): Change to "/distro/packages".
* guix/build-system/gnu.scm (standard-inputs): Change module name
  to (distro packages base).
* tests/packages.scm (test-packages): Likewise.
 2012-09-26 22:00:58 +02:00
Ludovic Courtès
8ffae202ac distro: GCC: Upgrade to 4.7.2. 
* distro/base.scm (gcc-4.7): Upgrade to 4.7.2.
 2012-09-26 21:48:22 +02:00
Ludovic Courtès
82dc2b9af9 distro: Add an ld' wrapper, to pass missing -rpath' flags. 
* distro/ld-wrapper.scm: New file.
* Makefile.am (MODULES): Add it.

* distro/base.scm (ld-wrapper-boot3): New variable.
  (%boot3-inputs): Add LD-WRAPPER-BOOT3.
  (bash-final, guile-final, ld-wrapper): New final.
  (%final-inputs): Use BASH-FINAL; add LD-WRAPPER.
  (gcc-4.7): Remove the `-rpath' trick from the `lib' spec string.
 2012-09-26 21:21:05 +02:00
Ludovic Courtès
dc8907d8e3 distro: gcc: Patch lib' spec to add -rpath' for each `-L'. 
* distro/base.scm (gcc-4.7): Patch `LIB_SPEC' to add `-rpath' for each
  `-L'.  Spec string suggested by Marc Glisse <marc.glisse@inria.fr>.
  (libtool): Add `libtool-skip-tests.patch'.

* distro/patches/libtool-skip-tests.patch: New file.
* Makefile.am (dist_patch_DATA): Add it.
 2012-09-14 00:49:39 +02:00
Ludovic Courtès
457dd86d66 Add (guix ftp) and companion modules. 
* guix/ftp-client.scm, guix/ftp.scm, guix/build/ftp.scm: New files.
* Makefile.am (MODULES): Add them.

* distro/base.scm (libffi): Use `ftp-fetch'.
 2012-09-12 23:47:49 +02:00
Ludovic Courtès
fb585745ad distro: Use our own Perl during bootstrap. 
* distro/base.scm (linux-headers-boot0): Use PERL with %BOOT0-INPUTS
  instead of calling out to `nixpkgs-derivation*'.
 2012-09-12 00:07:51 +02:00
Ludovic Courtès
dc0a9729dd distro: gcc: Add a RUNPATH on libc. 
* distro/base.scm (gcc-4.7): Remove unnecessary "libc" input.
  Add `-rpath LIBC/lib' to `LIB_SPEC'.
 2012-09-12 00:07:12 +02:00
Ludovic Courtès
b289e9f9dd distro: Add Perl. 
* distro/base.scm (perl): New variable.
* distro/patches/perl-no-sys-dirs.patch: New file.
* Makefile.am (dist_patch_DATA): Add it.
 2012-09-11 22:17:20 +02:00
Ludovic Courtès
321b099643 distro: Bootstrap via a cross-toolchain. 
This allows the final toolchain to be completely independent of
%BOOTSTRAP-INPUTS.

* distro/base.scm (glibc-dynamic-linker): New procedure.
  (gcc-4.7): Remove #:path-exclusions argument.  Check whether LIBC is
  #f before using it.
  (glibc): Remove "libc_cv_as_needed" hack.  Patch `Makeconfig' to
  remove `-lgcc_s'.
  (nix-system->gnu-triplet, boot-triplet): New variables.
  (binutils-boot0): Turn into a cross-Binutils targeting (boot-triplet
  SYSTEM).
  (gcc-boot0): Likewise.  Add configure options to make a smaller
  build.  Remove "binutils-source" from the input, and use
  BINUTILS-BOOT0 instead.
  (glibc-final): Cross-build using GCC-BOOT0 and BINUTILS-BOOT0.
  (gcc-boot0-wrapped): New variable.
  (%boot2-inputs): Use it.
  (m4-boot2, gmp-boot2, mpfr-boot2, mpc-boot2): Remove.
  (binutils-final): New variable.
  (gcc-final): Turn into a joint build with GMP/MPFR/MPC.  Use
  BINUTILS-FINAL.
  (%boot3-inputs): Adjust accordingly.
  (%boot4-inputs): Remove.
  (%final-inputs): Use %BOOT3-INPUTS.
 2012-09-11 22:08:55 +02:00
Ludovic Courtès
be13fbfa83 Add (guix build-system trivial). 
* guix/build-system/trivial.scm: New file.
* Makefile.am (MODULES): Add it.
* tests/packages.scm ("trivial"): New test.

* guix/packages.scm (package-derivation): Allow SOURCE to be #f.
 2012-09-10 22:47:10 +02:00
Ludovic Courtès
3c0670e686 distro: Reduce the bootstrap set. 
* distro/base.scm (%bootstrap-inputs): Remove `gnumake', `diffutils',
  and `findutils'.
  (gnu-make-boot0, diffutils-boot0, findutils-boot0, %boot0-inputs): New
  variables.
  (binutils-boot0, gcc-boot0, linux-headers-boot0, %boot1-inputs):
  Replace %BOOTSTRAP-INPUTS by %BOOT0-INPUTS.

  (final-inputs): Remove now unneeded call to
  `source-properties->location'.
 2012-09-07 15:49:48 +02:00
Ludovic Courtès
2d14ef0f2c build-system/gnu: Fix `#:path-exclusions' handling. 
* guix/build/gnu-build-system.scm (set-paths)[relevant-input-directories]:
  New procedure.  Use it.  This fixes #:path-exclusions handling.
 2012-09-06 22:58:43 +02:00