4155e2a909
Update license headers of builder-side code.
...
Change license headers with this script:
(use-modules (guix build utils))
(fluid-set! %default-port-encoding "UTF-8")
(substitute* (cons "distro/packages/ld-wrapper.scm"
(find-files "guix/build" "\\.scm$"))
(("^([[:graph:]]+) This file is part of Guix." _ comment-start)
(string-append comment-start " This file is part of GNU Guix."))
(("^([[:graph:]]+) Guix --- Nix package management.*" _ comment-start)
(string-append comment-start
" GNU Guix --- Functional package management for GNU\n"))
(("^([[:graph:]]+) Guix is " _ comment-start)
(string-append comment-start " GNU Guix is "))
(("^([[:graph:]]+) along with Guix." _ comment-start)
(string-append comment-start " along with GNU Guix."))
(("^([[:graph:]]+) Copyright \\(C\\)" _ comment-start)
(string-append comment-start " Copyright ©")))
* distro/packages/ld-wrapper.scm, guix/build/download.scm,
guix/build/gnu-build-system.scm, guix/build/union.scm,
guix/build/utils.scm: Update license headers.
2013-01-05 16:08:07 +01:00
7584f822bf
utils: Add `which'.
...
* guix/build/utils.scm (which): New procedure.
* distro/packages/lsh.scm (lsh): Use `which' instead of `search-path'.
* distro/packages/perl.scm (perl): Likewise.
* distro/packages/attr.scm (attr): Likewise.
2013-01-05 16:02:32 +01:00
312543dcfc
distro: make-bootstrap: Add `%bootstrap-tarballs' package.
...
* distro/packages/make-bootstrap.scm (%bootstrap-tarballs): New
variable.
2013-01-05 15:46:08 +01:00
d3b59727fb
distro: make-bootstrap: Build glibc without nscd, and with static NSS modules.
...
* distro/packages/make-bootstrap.scm (%glibc-with-relocatable-system):
Rename to...
(%glibc-for-bootstrap): ... this. Add new configure flags.
2013-01-05 12:41:05 +01:00
c2d771fd1d
distro: make-bootstrap: Make the Coreutils smaller.
...
* distro/packages/make-bootstrap.scm (%static-inputs)[coreutils]: Remove
optional dependencies, except Perl; build with "-Os -g0"; disable
tests.
2013-01-04 18:58:53 +01:00
fdc78b72f8
distro: make-bootstrap: Fix arguments to gawk.
...
* distro/packages/make-bootstrap.scm (%static-inputs)[gawk]: Use
`substitute-keyword-arguments' to preserve the #:phases argument of
GAWK.
2013-01-04 17:42:59 +01:00
2f8a123ed3
distro: libtool: Add a "bin" output.
...
* distro/packages/autotools.scm (libtool): Add a "bin" output.
* distro/packages/base.scm (guile-final): Remove comment about retained
dependency.
2013-01-02 23:40:56 +01:00
feddc16c70
distro: ncurses: Don't retain a reference to the bootstrap Bash.
...
* distro/packages/ncurses.scm (ncurses): Remove #:patch-shebangs?
argument since it now has no effect. Simplify PATCH-MAKEFILE-PHASE.
Add `configure-phase', and use it.
2013-01-02 23:12:27 +01:00
8ba8aeb74d
distro: coreutils: Enable tests; add dependency on ACL and GMP.
...
* distro/packages/base.scm (coreutils): Set #:parallel-build? #f. Add
`patch-shell-references' phase. Add 'acl', 'gmp', and 'perl' as
inputs, as suggested by Nikita Karetnikov.
2013-01-02 22:46:26 +01:00
2ea2baf16c
distro: acl: Patch references to /bin/sh.
...
* distro/packages/acl.scm (acl): Add `patch-makefile-SHELL' phase.
2013-01-02 22:46:24 +01:00
2aa4fb5f73
distro: gettext: Fix references to /bin/sh.
...
* distro/packages/gettext.scm (gettext): Add `patch-tests' phase.
2013-01-02 22:46:23 +01:00
a974a0be5b
distro: openssl: Build shared libraries.
...
* distro/packages/openssl.scm (openssl): `configure' phase: pass
"shared --libdir=lib".
2013-01-02 13:48:15 +01:00
f9975b5a49
distro: Add OpenSSL.
...
* distro/packages/openssl.scm: New file. `patch-tests' phase added by
Ludovic Courtès.
* Makefile.am (MODULES): Add it.
2013-01-02 13:31:13 +01:00
52b8e5fc30
distro: sed: Patch references to /bin/sh in the test suite.
...
* distro/packages/base.scm (sed): Add `patch-test-suite' phase.
2013-01-02 01:01:58 +01:00
46866fadee
distro: glibc: Build the statically-linked Bash embedded in glibc.
...
* distro/packages/base.scm (glibc): Expect "static-bash" to be a
directory, not a single file. Call `remove-store-references' on the
"bash" binary that is copied. Add an `sh' -> `bash' symlink. Change
the "static-bash" input to (static-package bash-light).
(glibc-final): Rename to...
(glibc-final-with-bootstrap-bash): ... this. Change `name' to
"glibc-intermediate". Remove #:patch-shebangs? setting.
(cross-gcc-wrapper): New procedure, with code formerly in
GCC-BOOT0-WRAPPED.
(gcc-boot0-wrapped): Use it.
(static-bash-for-glibc): New variable.
(glibc-final): Inherit from GLIBC-FINAL-WITH-BOOTSTRAP-BASH, and use
STATIC-BASH-FOR-GLIBC as the "static-bash" input.
2013-01-01 23:55:40 +01:00
8cd8e97cb5
distro: glibc: Fix contradicting settings of `BASH_SHELL'.
...
* distro/packages/base.scm (glibc-final): Remove `ac_cv_path_BASH_SHELL'
setting.
(glibc): Set `BASH_SHELL' instead of `ac_cv_path_BASH_SHELL'.
2013-01-01 23:50:52 +01:00
4d058c6792
build-system/gnu: Add `static-package'.
...
* distro/packages/make-bootstrap.scm (static-package): Move to...
* guix/build-system/gnu.scm (static-package): ... here. New procedure.
2013-01-01 16:55:34 +01:00
450fb5a6b4
distro: Move lightweight Bash to (distro packages bash).
...
* distro/packages/make-bootstrap.scm (%bash-static): Move BASH-LIGHT to...
* distro/packages/bash.scm (bash-light): ... here. New variable.
2013-01-01 16:54:45 +01:00
f678f6d913
distro: bzip2: Patch `SHELL' in `Makefile-libbz2_so'.
...
* distro/packages/compression.scm (bzip2): Call `patch-makefile-SHELL'
in BUILD-SHARED-LIB.
2012-12-31 01:13:04 +01:00
98ea038b47
distro: libc: Update to 2.17.
...
* distro/packages/base.scm (glibc): Update to 2.17.
2012-12-31 01:12:09 +01:00
380d5decfc
distro: attr: Fix references to /bin/sh.
...
* distro/packages/attr.scm (attr): Add `patch-makefile-SHELL'. Patch
`test/run' in `check' phase.
2012-12-21 23:52:48 +01:00
c089511288
build-system/gnu: Patch shebangs in all the source; patch SHELL in makefiles.
...
* guix/build/utils.scm (call-with-ascii-input-file): New procedure.
(patch-shebang): Use it.
(patch-makefile-SHELL): New procedure.
* guix/build/gnu-build-system.scm (patch-source-shebangs): Patch all the
files, not just executables; remove `po/Makefile.in.in' patching.
(patch-generated-files): Rename to...
(patch-generated-file-shebangs): ... this. Patch executables and
makefiles.
(%standard-phases): Adjust accordingly.
* distro/packages/autotools.scm (libtool): Remove call to `patch-shebang'.
* distro/packages/base.scm (gcc-4.7): Likewise.
(guile-final): Remove hack to skip `test-command-line-encoding2'.
* distro/packages/bash.scm (bash): Remove `pre-configure-phase'.
* distro/packages/readline.scm (readline): Likewise.
* distro/packages/ncurses.scm (ncurses): Remove `pre-install-phase'.
2012-12-21 22:31:25 +01:00
8722e80e82
distro: coreutils: Update to 8.20.
...
* distro/packages/base.scm (coreutils): Update to 8.20.
2012-12-21 17:59:23 +01:00
8ffaa93bff
distro: guile: Patch (ice-9 popen) to use the right shell.
...
* distro/packages/guile.scm (guile-2.0): Add `pre-configure'.
* distro/packages/base.scm (guile-final): Adjust to preserve the
`pre-configure' phase.
2012-12-20 23:07:46 +01:00
f5b7894942
distro: m4: Patch references to /bin/sh.
...
* distro/packages/m4.scm (m4): Add `pre-check' phase.
2012-12-20 19:01:14 +01:00
42ff70e262
distro: libtool: Run test suite in parallel; patch references to /bin/sh.
...
* distro/packages/autotools.scm (libtool): Add `pre-check' phase.
2012-12-20 19:00:14 +01:00
530c169561
distro: bash, readline: Patch so that `make' uses the right shell.
...
* distro/packages/readline.scm (readline): Add `pre-configure-phase' to
patch `MAKE_SHELL' in `configure. Move `post-install-phase' body to
a variable.
* distro/packages/bash.scm (bash): Likewise.
2012-12-20 18:02:07 +01:00
c20313637f
distro: gawk: Use the right shell instead of /bin/sh.
...
* distro/packages/gawk.scm (gawk): Patch shell file name in io.c.
2012-12-20 17:59:10 +01:00
8ccdbaa827
distro: Update `guile-final' to not fail during `patch-source-shebangs' phase.
...
* distro/packages/base.scm (guile-final): Add workaround on top of
GUILE-2.0/FIXED to avoid `patch-source-shebangs' failure on one of the
source files.
2012-12-20 01:38:56 +01:00
49f5a21698
distro: ncurses: Patch references to /bin/sh.
...
* distro/packages/ncurses.scm (ncurses): Add `patch-makefile-phase' and
`pre-install-phase'.
2012-12-20 01:38:56 +01:00
0f09955213
distro: Update bootstrap binaries.
...
Use bootstrap binaries that were generated with the `make-bootstrap'
changes introduced in previous commit.
* Makefile.am (nodist_bootstrap_x86_64_linux_DATA,
nodist_bootstrap_i686_linux_DATA): Change Guile tarball name.
(distro/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz,
distro/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz): New targets.
(distro/packages/bootstrap/x86_64-linux/guile-bootstrap-2.0.6.tar.xz,
distro/packages/bootstrap/i686-linux/guile-bootstrap-2.0.6.tar.xz):
Remove.
* build-aux/download.scm (file-name->uri): Use "20121219" directory.
* distro/packages/bootstrap.scm (%bootstrap-guile): Update file name.
(%bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc,
%bootstrap-gcc): Update directory name and hashes.
2012-12-20 01:38:56 +01:00
5d4fd2671a
distro: make-bootstrap: Have libc's functions search for `sh' in $PATH.
...
* distro/packages/make-bootstrap.scm (%glibc-with-relocatable-system,
%standard-inputs-with-relocatable-glibc): New variables.
(%static-inputs)[gawk]: Apply `gawk-shell.patch'.
[finalize]: New procedure.
Build all the packages against %STANDARD-INPUTS-WITH-RELOCATABLE-GLIBC.
(%glibc-stripped): Inherit from %GLIBC-WITH-RELOCATABLE-SYSTEM.
(%gcc-static, %guile-static): Build against
%STANDARD-INPUTS-WITH-RELOCATABLE-GLIBC.
* distro/packages/patches/gawk-shell.patch,
distro/packages/patches/glibc-bootstrap-system.patch: New files.
* Makefile.am (dist_patch_DATA): Add them.
2012-12-20 01:38:56 +01:00
6e32f6c019
distro: glibc: Add a statically-linked Bash to $out/bin.
...
* distro/packages/base.scm (glibc): Pass `ac_cv_path_BASH_SHELL' in the
configure flags. During the `pre-configure' phase, copy the
"static-bash" input to $out/bin, and change `system' and `popen' to
use it instead of /bin/sh. Add the "static-bash" input.
Suggested by Shea Levy <shea@shealevy.com> and
Lluís Batlle i Rossell <viric@viric.name>.
2012-12-20 01:38:56 +01:00
d6f80f187c
distro: gcc: Patch to allow builds without /bin/sh.
...
* distro/packages/base.scm (gcc-4.7): In `pre-configure' phase, patch
shebang in `gcc/exec-tool.in'.
2012-12-20 01:38:56 +01:00
dfb53ee232
distro: ld-wrapper: Use the current Bash instead of /bin/sh.
...
* distro/packages/ld-wrapper.scm: Use @BASH@ in shebang. Change module
name to (gnu build-support ld-wrapper).
* distro/packages/base.scm (ld-wrapper-boot3): Substitute @BASH@.
(ld-wrapper): Use BASH-FINAL.
2012-12-20 01:38:54 +01:00
ea8fbbf2f2
distro: make: Change default shell from /bin/sh to the actual shell.
...
* distro/packages/base.scm (gnu-make): Add `set-default-shell' phase.
(gnu-make-boot0): Adjust phases accordingly.
2012-12-19 12:34:53 +01:00
45298f8fd2
distro: Linux-Libre: Set $ARCH based on the actual system type.
...
* distro/packages/linux.scm (linux-libre-headers): Set $ARCH based on
the `system' keyword argument.
2012-12-19 00:48:13 +01:00
325285d581
distro: guile: Switch to 2.0.7.
...
* distro/packages/guile.scm (guile-2.0/fixed): Alias GUILE-2.0.
2012-12-18 22:16:21 +01:00
d008415219
build-system/gnu: Patch shebangs in executable source files.
...
This allows many packages to build in a chroot that lacks /bin and
thus /bin/sh.
* guix/build/gnu-build-system.scm (patch-source-shebangs): New
procedure.
(%standard-phases): Add it.
* guix/build/utils.scm (executable-file?): New procedure.
* distro/packages/perl.scm (perl): Don't use /bin/sh to run `Configure'.
2012-12-15 16:35:26 +01:00
a784c3077e
Merge branch 'master' into core-updates
...
Conflicts:
distro/packages/multiprecision.scm
2012-12-15 15:28:50 +01:00
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
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
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
8e1cd71376
distro: mpc: Update to 1.0.1.
...
* distro/packages/multiprecision.scm (mpc): Update to 1.0.1.
2012-12-13 22:28:46 +01:00
d7e2841b9d
distro: lout: Comment out dependency on Ghostscript.
...
* distro/packages/lout.scm (lout): Temporarily comment out dependency on
Ghostscript as this was causing evaluation errors on Hydra.
2012-12-13 22:28:34 +01:00
836676450d
distro: lout: Delay use of of `nixpkgs-derivation'.
...
* distro/packages/lout.scm (lout): Don't fork with `nixpkgs-derivation',
to avoid any issues in the absence of `nix-instantiate'.
2012-12-10 14:35:03 +01:00
6ad2697d23
distro: Add ACL.
...
* distro/packages/acl.scm: New file. Dependency on Perl added by
Ludovic.
* Makefile.am (MODULES): Add it.
2012-12-07 22:32:00 +01:00
3d282f90f8
distro: Add Attr.
...
* distro/packages/attr.scm: New file. Dependency on Perl and
`patch-shebang' added by Ludovic.
* Makefile.am (MODULES): Add it.
2012-12-07 22:30:32 +01:00
18d50d7621
distro: Add GNU lsh.
...
* distro/packages/lsh.scm,
distro/packages/patches/lsh-guile-compat.patch:
distro/packages/patches/lsh-no-root-login.patch:
distro/packages/patches/lsh-pam-service-name.patch: New files.
* Makefile.am (MODULES): Add lsh.scm.
(dist_patch_DATA): Add the above patches.
2012-12-04 22:03:21 +01:00
02b80c3f65
distro: Add util-linux.
...
* distro/packages/linux.scm (util-linux): New variable.
2012-12-04 17:46:56 +01:00
Ludovic Courtès
Andreas Enge
Nikita Karetnikov