nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
506 Commits 1 Branch 0 Tags 104 MiB
Commit Graph

65 Commits

Author SHA1 Message Date
Ludovic Courtès a784c3077e Merge branch 'master' into core-updates 
Conflicts:
	distro/packages/multiprecision.scm
 2012-12-15 15:28:50 +01:00
Nikita Karetnikov 4a44e743a0 distro: Use (guix licenses) instead of strings. 
* distro/packages/acl.scm, distro/packages/attr.scm,
  distro/packages/autotools.scm, distro/packages/base.scm,
  distro/packages/bash.scm, distro/packages/bdw-gc.scm,
  distro/packages/bison.scm, distro/packages/bootstrap.scm,
  distro/packages/compression.scm, distro/packages/cpio.scm,
  distro/packages/ddrescue.scm, distro/packages/ed.scm,
  distro/packages/flex.scm, distro/packages/gawk.scm,
  distro/packages/gdbm.scm, distro/packages/gettext.scm,
  distro/packages/gnupg.scm, distro/packages/gnutls.scm,
  distro/packages/gperf.scm, distro/packages/guile.scm,
  distro/packages/help2man.scm, distro/packages/less.scm,
  distro/packages/libffi.scm, distro/packages/libsigsegv.scm,
  distro/packages/libunistring.scm, distro/packages/linux.scm,
  distro/packages/lout.scm, distro/packages/lsh.scm,
  distro/packages/m4.scm, distro/packages/multiprecision.scm,
  distro/packages/nano.scm, distro/packages/ncurses.scm,
  distro/packages/nettle.scm, distro/packages/perl.scm,
  distro/packages/pkg-config.scm, distro/packages/pth.scm,
  distro/packages/readline.scm, distro/packages/recutils.scm,
  distro/packages/shishi.scm, distro/packages/system.scm,
  distro/packages/texinfo.scm, distro/packages/time.scm,
  distro/packages/wget.scm, distro/packages/which.scm,
  distro/packages/zile.scm: Use (guix licenses).
 2012-12-14 23:37:24 +01:00
Ludovic Courtès 7f131cf368 distro: Fix incorrect "bash" input for gcc-boot0-wrapped. 
* distro/packages/base.scm (gcc-boot0-wrapped): Fix incorrect "bash" input.
 2012-12-14 18:04:27 +01:00
Ludovic Courtès 9d1d434cd0 build-system/gnu: Avoid using /bin/sh. 
* guix/build/gnu-build-system.scm (configure): Add `inputs' keyword
  parameter.  Take Bash from there, falling back to /bin/sh.  Set
  `CONFIG_SHELL' and `SHELL' to that Bash.  Run "bash ./configure"
  instead of just "./configure".
* distro/packages/bootstrap.scm (%bootstrap-inputs): Add "bash".
* distro/packages/base.scm (gcc-boot0-wrapped): Use "bash" from
  %BOOT1-INPUTS instead of /bin/sh.
 2012-12-13 23:38:32 +01:00
Ludovic Courtès fa29b19988 distro: Add `guile-2.0/fixed', which should rarely change. 
* distro/packages/guile.scm (guile-2.0/fixed): New variable.
* distro/packages/base.scm (guile-final): Use it.
 2012-11-30 21:37:41 +01:00
Ludovic Courtès 80fe5c6046 distro: linux-libre-headers: Move to (distro packages linux). 
* distro/packages/base.scm (linux-libre-headers): Move to...
* distro/packages/linux.scm (linux-libre-headers): ... here.
 2012-11-27 22:04:57 +01:00
Ludovic Courtès 01d45404f6 distro: Configure ld and GCC to not look under /usr & co. 
This fixes impurities with non-chroot builds on LFS-style distros.

* distro/packages/base.scm (binutils): Pass `--with-lib-path'.
  (gcc-4.7): Pass `--with-local-prefix'.
* distro/packages/make-bootstrap.scm (%binutils-static): Pass
  `--with-lib-path'.
 2012-11-16 00:23:06 +01:00
Ludovic Courtès 25608d640a distro: Patch libc to avoid accessing /etc/ld.so.cache and friends. 
* distro/packages/base.scm (glibc): Apply `glibc-no-ld-so-cache.patch'.
  (glibc-final): Inherit GLIBC's inputs.
* distro/packages/patches/glibc-no-ld-so-cache.patch: New file.
* Makefile.am (dist_patch_DATA): Add it.
 2012-11-13 00:23:43 +01:00
Ludovic Courtès 0db342a590 distro: Use `mirror://' URLs. 
* distro/packages/base.scm, distro/packages/bash.scm,
  distro/packages/compression.scm, distro/packages/gawk.scm,
  distro/packages/gperf.scm, distro/packages/guile.scm,
  distro/packages/libsigsegv.scm, distro/packages/libtool.scm,
  distro/packages/libunistring.scm, distro/packages/m4.scm,
  distro/packages/multiprecision.scm, distro/packages/ncurses.scm,
  distro/packages/pth.scm, distro/packages/readline.scm,
  distro/packages/recutils.scm: Use `mirror://gnu' URLs.
* distro/packages/gnupg.scm: Use `mirror://gnupg' URLs.
 2012-11-13 00:23:43 +01:00
Ludovic Courtès 87f5d36630 Remove (guix http) and (guix ftp). 
* guix/ftp.scm, guix/http.scm, guix/build/ftp.scm, guix/build/http.scm:
  Remove.
* Makefile.am (MODULES): Likewise.
* tests/builders.scm, distro/packages/base.scm,
  distro/packages/bash.scm, distro/packages/bdw-gc.scm,
  distro/packages/compression.scm, distro/packages/gawk.scm,
  distro/packages/gnupg.scm, distro/packages/gperf.scm,
  distro/packages/guile.scm, distro/packages/libffi.scm,
  distro/packages/libsigsegv.scm, distro/packages/libtool.scm,
  distro/packages/libunistring.scm, distro/packages/lout.scm,
  distro/packages/m4.scm, distro/packages/multiprecision.scm,
  distro/packages/ncurses.scm, distro/packages/perl.scm,
  distro/packages/pkg-config.scm, distro/packages/pth.scm,
  distro/packages/readline.scm, distro/packages/recutils.scm: Use
  `url-fetch' instead of `http-fetch' and `ftp-fetch'.
* distro/packages/bootstrap.scm: Likewise
  (bootstrap-origin): Remove references to `http-fetch' and
  `ftp-fetch'.
* guix.scm (%public-modules): Remove `http' and `ftp'; add `download'.
 2012-11-13 00:23:39 +01:00
Ludovic Courtès 8ba60d7b65 distro: Move bootstrap tarball packages to (distro packages make-bootstrap). 
* distro/packages/base.scm (binutils-final): Make public.
  (static-package, %bash-static, %static-inputs, %static-binaries,
  %binutils-static, %binutils-static-stripped, %glibc-stripped,
  %gcc-static, %gcc-stripped, %guile-static, %guile-static-stripped,
  tarball-package, %bootstrap-binaries-tarball,
  %binutils-bootstrap-tarball, %glibc-bootstrap-tarball,
  %guile-bootstrap-tarball): Move to...
* distro/packages/make-bootstrap.scm: ... here.  New file.
* Makefile.am (MODULES): Add it.
 2012-11-06 22:55:44 +01:00
Ludovic Courtès ce1ef15b25 distro: bash-final: Link with `-static-libgcc'. 
* distro/packages/base.scm (bash-final): Pass through
  `static-libgcc-package'.
 2012-11-05 23:51:43 +01:00
Ludovic Courtès bca114d528 distro: gcc: Don't add a RUNPATH to GCC when using `-static-libgcc'. 
* distro/packages/base.scm (gcc-4.7)[LIB_SPEC]: Add a `-rpath' to GCC
  only when !static and !static-libgcc.
 2012-11-05 23:51:07 +01:00
Ludovic Courtès 0af2c24ef7 utils: Add `default-keyword-arguments' and `substitute-keyword-arguments'. 
* distro/packages/base.scm (default-keyword-arguments,
  substitute-keyword-arguments): Move to...
* guix/utils.scm: ... here.
 2012-11-05 23:50:57 +01:00
Ludovic Courtès a48dddfe9c distro: Add missing `package-with-bootstrap-guile'. 
* distro/packages/base.scm (binutils-final): Add missing
  `package-with-bootstrap-guile'.
 2012-11-05 00:28:41 +01:00
Ludovic Courtès a268f085db distro: Add (distro packages compression). 
* distro/packages/base.scm (gzip, bzip2, xz): Move to...
* distro/packages/compression.scm: ... here.  New file.
* Makefile.am (MODULES): Add it.
 2012-11-04 23:16:58 +01:00
Ludovic Courtès c44899a28b distro: Split (distro packages base) into several files. 
* distro/packages/base.scm (libsigsegv, gawk, perl, m4, gmp, mpfr, mpc,
  ncurses, readline, bash, libtool, libunistring, libffi, pkg-config,
  libgc): Move to modules of their own.
  (guile-1.8, guile-2.0): Move to...
* distro/packages/guile.scm: ... here.

* distro/packages/bash.scm, distro/packages/bdw-gc.scm,
  distro/packages/gawk.scm, distro/packages/libffi.scm,
  distro/packages/libsigsegv.scm, distro/packages/libtool.scm,
  distro/packages/libunistring.scm, distro/packages/m4.scm,
  distro/packages/multiprecision.scm, distro/packages/ncurses.scm,
  distro/packages/perl.scm, distro/packages/pkg-config.scm,
  distro/packages/readline.scm: New files.
 2012-11-04 22:37:22 +01:00
Ludovic Courtès 18633d4f35 distro: Move bootstrap packages to (distro packages bootstrap). 
* distro/packages/base.scm (glibc-dynamic-linker, %bootstrap-guile,
  bootstrap-origin, package-from-tarball, %bootstrap-base-url,
  %bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc,
  %bootstrap-gcc, %bootstrap-inputs, package-with-bootstrap-guile): Move
  to ...
* distro/packages/bootstrap.scm: ... here.  New file.
* Makefile.am (MODULES): Add it.
* tests/builders.scm: Use (distro packages bootstrap).
  (%bootstrap-guile): Remove.
* tests/packages.scm: Likewise.
* tests/union.scm: Likewise, and remove @@ to access %bootstrap-inputs.
* tests/derivations.scm: Use (distro packages bootstrap) and remove @@
  to access %bootstrap-coreutils&co.
* HACKING (When the platform is supported by Nixpkgs): Update
  accordingly.
 2012-11-04 22:04:41 +01:00
Ludovic Courtès d45122f537 packages: `description' → `synopsis', `long-description' → `description'. 
* guix/packages.scm (<package>): Rename `description' to `synopsis', and
  `long-description' to `description'.
* tests/packages.scm, distro/packages/base.scm,
  distro/packages/databases.scm, distro/packages/guile.scm,
  distro/packages/typesetting.scm:  Update accordingly.
* po/Makevars (XGETTEXT_OPTIONS): Update `--keyword' flags accordingly.
 2012-11-04 13:48:35 +01:00
Ludovic Courtès d6ed71cbf4 distro: Build Bash sequentially. 
* distro/packages/base.scm (bash): Set `#:parallel-build?' and
  `#:parallel-tests?' to #f.
 2012-10-28 01:59:33 +02:00
Ludovic Courtès d25468bcb2 distro: Add i686-linux port. 
* distro/packages/bootstrap/i686-linux/bash,
  distro/packages/bootstrap/i686-linux/mkdir,
  distro/packages/bootstrap/i686-linux/tar,
  distro/packages/bootstrap/i686-linux/xz: New files.

* distro/packages/base.scm (%bootstrap-coreutils&co,
  %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Add hashes of
  the i686-linux tarballs.

* Makefile.am (bootstrap_i686_linuxdir, dist_bootstrap_i686_linux_DATA,
  nodist_bootstrap_i686_linux_DATA): New variables
  (DISTCLEANFILES): Add $(nodist_bootstrap_i686_linux_DATA).
  (distro/packages/bootstrap/i686-linux/guile-bootstrap-2.0.6.tar.xz):
  New rule.
 2012-10-26 19:10:37 +02:00
Ludovic Courtès fc95fdaebe distro: gcc: Adjust to support non-x86_64 architectures. 
* distro/packages/base.scm (gcc-4.7)[arguments]: In the `pre-configure'
  phase, patch all the relevant gcc/config files, not just those for
  x86_64-linux-gnu.
 2012-10-26 18:51:22 +02:00
Ludovic Courtès 20d83444dd utils: Remove special `substitute*' syntax for lists of files. 
* guix/build/utils.scm (substitute*): Remove special syntax for
  list-of-files; instead, check whether FILE is `list?' at run time.

* distro/packages/base.scm (gcc-4.7, %binutils-static): Adjust
  accordingly.
 2012-10-26 09:07:37 +02:00
Ludovic Courtès b642e4b853 packages: Pass `system' around. 
* guix/packages.scm (package-source-derivation): Add `system'
  parameter.  Pass it to METHOD.
  (package-derivation)[expand-input]: Pass SYSTEM to
  `package-derivation' and `package-source-derivation'.

* distro/packages/base.scm (package-with-bootstrap-guile)[boot]: Pass
  SYSTEM to FETCH.
 2012-10-25 23:41:15 +02:00
Ludovic Courtès 4033bde841 distro: Build the final inputs against the final Bash, not the bootstrap Bash. 
* distro/packages/base.scm (%boot4-inputs): New variable.
  (guile-final): Use it.
  (%final-inputs): Build with %BOOT4-INPUTS, not %BOOT3-INPUTS.
 2012-10-25 17:55:45 +02:00
Ludovic Courtès e67245597e distro: ncurses: Don't patch shebangs. 
* distro/packages/base.scm (ncurses): Pass #:patch-shebangs? #f.
 2012-10-25 17:54:17 +02:00
Ludovic Courtès 60c21332d2 distro: Bootstrap using our own binaries instead of those from Nixpkgs. 
* distro/packages/base.scm (%bootstrap-inputs): Switch to using our own
  bootstrap binaries instead of those from Nixpkgs.
 2012-10-25 17:41:18 +02:00
Ludovic Courtès 1c702d1e92 distro: Build glibc with `--enable-obsolete-rpc'. 
* distro/packages/base.scm (glibc-final): Pass `--enable-obsolete-rpc'.
  (%bootstrap-glibc): Update hash accordingly.
 2012-10-25 17:36:46 +02:00
Ludovic Courtès 371a20e048 distro: Add missing Linux-Libre headers to the bootstrap glibc. 
* distro/packages/base.scm (%glibc-stripped): Copy all of Linux-Libre's
  `include/asm' directory; copy a few linux/ headers too.
  (%bootstrap-glibc): Update tarball hash.
 2012-10-25 00:58:39 +02:00
Ludovic Courtès 5ab57a13dd distro: Add a bootstrap GCC that uses binaries from the tarball. 
* distro/packages/base.scm (%bootstrap-gcc): New variable.
 2012-10-25 00:58:39 +02:00
Ludovic Courtès e6cc3d8654 distro: Add missing commands in the bootstrap binaries. 
* distro/packages/base.scm (%static-inputs): Add an `awk' -> `gawk', and
  `sh' -> `bash' symlinks.  Add `fgrep' and `egrep'.
  (%bootstrap-coreutils&co): Use new tarball that contains that
  symlink.

* distro/packages/bootstrap/x86_64-linux/bash,
  distro/packages/bootstrap/x86_64-linux/mkdir,
  distro/packages/bootstrap/x86_64-linux/tar,
  distro/packages/bootstrap/x86_64-linux/xz: Use binaries from that
  tarball (the previous binaries hadn't gone through
  `remove-store-references', which is fixed now.)
 2012-10-24 23:52:03 +02:00
Ludovic Courtès 1430808cae distro: Update file name of initial Binutils tarball. 
* distro/packages/base.scm (%bootstrap-binutils): Update remote file
  name.
 2012-10-24 00:21:30 +02:00
Ludovic Courtès d398e2c242 distro: Update bootstrap glibc package. 
* distro/packages/base.scm (%bootstrap-glibc): Update initial regexp to
  make it less Nixish.  Update hash to new tarball.
 2012-10-24 00:09:01 +02:00
Ludovic Courtès 827a3087da distro: Add required Linux-Libre headers to the glibc tarball. 
* distro/packages/base.scm (%glibc-stripped): Include required headers
  from Linux-Libre.
 2012-10-24 00:07:12 +02:00
Ludovic Courtès 3f8de86dec distro: gcc: No longer store the absolute path of crt files. 
* distro/packages/base.scm (gcc-4.7): Define
  STANDARD_STARTFILE_PREFIX_[12] instead of storing the absolute path of
  crt files.
 2012-10-23 23:38:02 +02:00
Ludovic Courtès 40749fb6eb distro: Fix GCC tarball to include the `libexec' directory. 
* distro/packages/base.scm (%gcc-stripped): Copy $gcc/libexec to $out.
 2012-10-23 22:00:06 +02:00
Ludovic Courtès 131edf67a0 distro: Fix glibc tarball to include *.so.*. 
* distro/packages/base.scm (%glibc-stripped): Fix regexp to
  include *.so.* in the output.
 2012-10-23 21:59:09 +02:00
Ludovic Courtès 5155fb89b2 distro: Add a statically-linked GCC for bootstrapping. 
* distro/packages/base.scm (%gcc-static): New variable.
  (%gcc-stripped): Use it.
 2012-10-22 22:22:37 +02:00
Ludovic Courtès 83ce0cf1f1 distro: Add a package that gets the bootstrap glibc from a tarball. 
* distro/packages/base.scm (%bootstrap-glibc): New variable.
 2012-10-21 22:01:49 +02:00
Ludovic Courtès 80d09f7452 distro: Add packages that get Coreutils, Binutils & co. from tarballs. 
* distro/packages/base.scm (package-from-tarball): New procedure.
  (%bootstrap-base-url, %bootstrap-coreutils&co, %bootstrap-binutils):
  New variables.
 2012-10-21 22:00:38 +02:00
Ludovic Courtès 095c7a2683 distro: Add a bootstrap GCC tarball. 
* distro/packages/base.scm (%gcc-stripped, %gcc-bootstrap-tarball): New
  variables.
 2012-10-21 15:57:04 +02:00
Ludovic Courtès 58a7891ccf distro: Add a bootstrap glibc tarball. 
* distro/packages/base.scm (%glibc-stripped, %glibc-bootstrap-tarball):
  New variables.
 2012-10-21 15:26:46 +02:00
Ludovic Courtès 17ff4ccdf5 distro: Add tools to build a tarball of statically-linked Binutils programs. 
* distro/packages/base.scm (%binutils-static, %binutils-static-stripped,
  %binutils-bootstrap-tarball): New variables.
 2012-10-20 16:12:26 +02:00
Ludovic Courtès 5cbb559046 distro: Add a package to build a tarball of the bootstrap binaries. 
* distro/packages/base.scm (tarball-package): New procedure.
  (%bootstrap-binaries-tarball): New variable.
  (%guile-bootstrap-tarball): Define in terms of `tarball-package'.
 2012-10-20 11:51:07 +02:00
Ludovic Courtès a5a349f302 distro: Provide a more descriptive report when a bootstrap binary is missing. 
* distro/packages/base.scm (%bootstrap-guile): Error out when
  `search-bootstrap-binary' returns #f.
 2012-10-18 23:36:29 +02:00
Ludovic Courtès d6e8777688 distro: Use the bootstrap Guile for the derivation of sources. 
* distro/packages/base.scm (bootstrap-origin,
  package-with-bootstrap-guile): New procedures.
  (gnu-make-boot0, diffutils-boot0, findutils-boot0, binutils-boot0,
  gcc-boot0, linux-libre-headers-boot0, glibc-final, bash-final,
  guile-final): Use `package-with-bootstrap-guile'.
  (gcc-boot0-wrapped): Clear `source'.

* guix/ftp.scm (ftp-fetch): Add a #:guile keyword parameter.  Honor it.
* guix/http.scm (http-fetch): Likewise.
 2012-10-18 23:18:38 +02:00
Ludovic Courtès e3dadc6818 distro: bzip2: Simplify installation phase with `find-files'. 
* distro/packages/base.scm (bzip2): Use `find-files' instead of rolling
  our own with `file-system-fold'.
 2012-10-18 21:43:35 +02:00
Ludovic Courtès 207ad6b2e9 distro: %static-binaries: Use (guix build utils). 
* distro/packages/base.scm (%static-binaries): Add missing
  use of (guix build utils).
 2012-10-18 21:42:19 +02:00
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