rekahsoft/guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
795 Commits 4 Branches 0 Tags 1,020 MiB
a6ef51e378
Commit Graph

795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ludovic Courtès
9762706b90 guix-package: Be verbose when Guile itself needs to be built. 
* guix-package.in (guix-package)[guile-missing?]: New procedure.
  (guix-package): Always redirect `current-build-output-port' to
  `current-error-port' when (guile-missing?).
 2013-01-08 00:04:46 +01:00
Ludovic Courtès
cc57f25d96 guix-package: Remove -b' shorthand for --bootstrap'. 
* guix-package.in (%options): Remove #\b as an alternate for
  "bootstrap".
  (show-help): Adjust accordingly.
* tests/guix-package.sh: Use `--bootstrap' instead of `-b'.
 2013-01-07 22:54:54 +01:00
Ludovic Courtès
ad85c617b5 snix: Update `license' check in unit test. 
* tests/snix.scm ("nixpkgs->guix-package"): Expect `license' to be a
  symbol.  This is a follow-up to commit e7aa73e.
 2013-01-07 22:53:46 +01:00
Ludovic Courtès
e7aa73ef09 snix: Use (guix licenses) variables. 
* guix/snix.scm (snix-derivation->guix-package)[license-variable]: New
  procedure.
  Use it to determine the variable name for the license.
 2013-01-07 22:32:28 +01:00
Ludovic Courtès
ab8ed44fce snix: Gracefully handle `null' in Nix build inputs. 
* guix/snix.scm (snix-derivation->guix-package)[convert-inputs]:
  Gracefully handle `null' as an input.
 2013-01-07 22:23:50 +01:00
Ludovic Courtès
708d0ceb50 distro: Add GNU Aspell. 
* distro/packages/aspell.scm: New file.
* Makefile.am (MODULES): Add it.
 2013-01-07 21:30:45 +01:00
Ludovic Courtès
4e6b699d50 distro: Add GSL. 
* distro/packages/algebra.scm (gsl): New variable.
 2013-01-07 21:23:33 +01:00
Ludovic Courtès
27160c856b distro: Add GNU GLOBAL. 
* distro/packages/global.scm: New file.
* Makefile.am (MODULES): Add it.
 2013-01-07 21:12:12 +01:00
Ludovic Courtès
4a219a1a47 distro: Add Tcl, Expect, and DejaGNU. 
* distro/packages/dejagnu.scm, distro/packages/tcl.scm: New files.
* Makefile.am (MODULES): Add them.
 2013-01-07 21:11:19 +01:00
Ludovic Courtès
b30e4f3f12 distro: bdb: Adjust to lack of /bin/sh. 
* distro/packages/bdb.scm (bdb): Pass `CONFIG_SHELL' and `SHELL' to the
  `configure' script.
 2013-01-06 18:47:24 +01:00
Ludovic Courtès
2357f85032 Update a few more license headers. 
* distro/packages/openssl.scm, m4/guix.m4, nix/sync-with-upstream:
  Update headers.
 2013-01-06 18:43:58 +01:00
Ludovic Courtès
e66ca1a5a8 download: Report the progress of HTTP downloads. 
* guix/build/download.scm (http-fetch): Rename `bv' to `bv-or-port'.
  Use `http-get*' followed by `dump-port' when the former is available,
  and pass a progress procedure to `dump-port'.
 2013-01-06 18:36:50 +01:00
Ludovic Courtès
e47bac7902 download: Report the progress of FTP downloads. 
* guix/build/download.scm (progress-proc): New procedure.
  (ftp-fetch): Call `ftp-size' on URI.  Use `progress-proc', and pass
  the result to `dump-port', along with #:buffer-size.
 2013-01-06 18:35:23 +01:00
Ludovic Courtès
fb83842efb ftp-client: Add `ftp-size'. 
* guix/ftp-client.scm (ftp-size): New procedure.
 2013-01-06 18:23:44 +01:00
Ludovic Courtès
a9f8b72ee1 distro: time: Adjust configure' phase to old configure' script. 
* distro/packages/time.scm (time): Add `arguments'.
 2013-01-06 17:42:59 +01:00
Ludovic Courtès
4050e5d6cf Merge branch 'master' into core-updates 
Conflicts:
	build-aux/download.scm
	distro/packages/autotools.scm
	distro/packages/base.scm
	distro/packages/bootstrap.scm
	distro/packages/lsh.scm
	distro/packages/make-bootstrap.scm
	distro/packages/ncurses.scm
	distro/packages/perl.scm
	tests/derivations.scm
	tests/union.scm
 2013-01-06 17:33:02 +01:00
Ludovic Courtès
79580eb698 distro: Update bootstrap binaries to an nscd-less libc. 
Update bootstrap binaries following changes in commit d3b5972 ("Build
glibc without nscd, and with static NSS modules.")

* Makefile.am (distro/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz,
  distro/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz): Update hashes.
* build-aux/download.scm (file-name->uri): Update URL.
* distro/packages/bootstrap.scm (%bootstrap-coreutils&co,
  %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Update URLs
  and hashes.
 2013-01-06 01:16:14 +01:00
Ludovic Courtès
233e76769a Update license headers. 
Change all license headers, except guix/build/* and ld-wrapper.scm, with
this code:

  (use-modules (guix build utils)
	       (srfi srfi-1))

  (fluid-set! %default-port-encoding "UTF-8")

  (substitute* (remove (lambda (f)
			 (or (string-contains f ".tar.")
			     (string-contains f ".git/")
			     (string-contains f ".so")
			     (string-suffix? ".o" f)
			     (string-suffix? ".a" f)
			     (string-suffix? ".go" f)
			     (string-suffix? ".pdf" f)
			     (string-suffix? ".png" f)
			     (string-suffix? ".info" f)
			     (equal? (basename f) "guix-daemon")
			     (equal? (basename f) "nix-setuid-helper")
			     (string-contains f "nix-upstream/")
			     (string-contains f "distro/packages/bootstrap/")))
		       (find-files "." "\\.[a-z]+$"))
    (("^([[: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 ©")))

Change headers using C-style comments manually.
 2013-01-06 00:47:50 +01:00
Ludovic Courtès
fe8ff02827 Add `guix-gc'. 
* guix-gc.in, tests/guix-gc.sh: New files.
* configure.ac: Output `guix-gc', and make it executable.
* Makefile.am (bin_SCRIPTS): Add `guix-gc'.
  (TESTS): Add `tests/guix-gc.sh'.
* doc/guix.texi (Features): Add xref to "Invoking guix-gc".
  (Invoking guix-gc): New node.
* po/POTFILES.in: Add `guix-gc.in'.
 2013-01-06 00:28:06 +01:00
Ludovic Courtès
2646c55b03 guix-build: Make `--root' effective for .drv files too. 
* guix-build.in (guix-build)[register-root]: Change first argument to
  `paths', which should be a list of store paths.  Update caller to call
  `derivation-path->output-paths' on DRV.  When `derivations-only?',
  also register root for .drv files.
 2013-01-06 00:18:43 +01:00
Ludovic Courtès
7244a5f74e derivations: Add `derivation-path->output-paths'. 
* guix/derivations.scm (derivation-path->output-paths): New procedure.
* tests/derivations.scm ("multiple-output derivation"): Test it.
 2013-01-05 23:51:13 +01:00
Ludovic Courtès
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
Ludovic Courtès
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
Ludovic Courtès
3441e16497 ui: Factorize bug-report information in `--help'. 
* guix/config.scm.in (%guix-home-page-url): New variable.
* guix/ui.scm (show-bug-report-information): New procedure.
* guix-build.in (show-help): Use it.
* guix-download.in (show-help): Likewise.
* guix-import.in (show-help): Likewise.
* guix-package.in (show-help): Likewise.
 2013-01-05 15:55:47 +01:00
Ludovic Courtès
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
Ludovic Courtès
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
Ludovic Courtès
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
Ludovic Courtès
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
Ludovic Courtès
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
Ludovic Courtès
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
Ludovic Courtès
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
Ludovic Courtès
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
Ludovic Courtès
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
Ludovic Courtès
706d0641cf daemon: Show the chroot contents upon `--debug'. 
* nix/nix-daemon/guix-daemon.cc (main)[HAVE_CHROOT]: Display the
  contents of `settings.dirsInChroot' at `lvlDebug'.
 2013-01-02 18:31:40 +01:00
Andreas Enge
60a290926b distro: Add Berkeley DB. 
* distro/packages/bdb.scm: New file.
* Makefile.am (MODULES): Add it.
 2013-01-02 18:13:07 +01:00
Ludovic Courtès
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
Andreas Enge
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
Ludovic Courtès
bb1ff9aa0a release.nix: Update to new bootstrap Guile tarball. 
* release.nix (bootstrap_guile): Update URLs and SHA256.
  (build)[preBuild]: Adjust tarball name.
 2013-01-02 12:42:54 +01:00
Andreas Enge
9dc6f288bf distro: Add MIT Kerberos 5. 
* distro/packages/mit-krb5.scm: New file.
* Makefile.am (MODULES): Add it.
 2013-01-02 01:08:51 +01:00
Ludovic Courtès
5501e6b64f daemon: Properly initialize libgcrypt. 
* nix/nix-daemon/guix-daemon.cc (main): Call `gcry_check_version'.
 2013-01-02 01:07:53 +01:00
Ludovic Courtès
97d3998e7a tests: Adjust to not rely on /bin/sh. 
* tests/derivations.scm (%bash): New variable.
  Replace occurrences of "/bin/sh" by %BASH.
* tests/union.scm ("union-build"): Delete duplicates from
  %BOOTSTRAP-INPUTS.
 2013-01-02 01:04:37 +01:00
Ludovic Courtès
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
Ludovic Courtès
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
Ludovic Courtès
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
Ludovic Courtès
93b0357575 utils: Use binary I/O primitives for `remove-store-references'. 
* guix/build/utils.scm (fold-port-matches)[get-char]: New procedure.
  (remove-store-references): Use `put-u8' and `put-bytevector'.
 2013-01-01 23:12:34 +01:00
Ludovic Courtès
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
Ludovic Courtès
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
Ludovic Courtès
b2adb3ae04 build-system/gnu: Add support for the "bin" output. 
* guix/build/gnu-build-system.scm (configure): Add support for "bin"
  output.
 2013-01-01 16:52:27 +01:00
Ludovic Courtès
03fa275801 build: Avoid error message during make clean' when test-tmp' doesn't exist. 
* daemon.am (clean-local): Check whether $(GUIX_TEST_ROOT) exists before
  running `find'.
 2012-12-31 13:19:29 +01:00
Ludovic Courtès
bc5bf85fa2 utils: Restore the mtime/atime of patched files. 
* guix/build/utils.scm (set-file-time): New procedure.
  (patch-shebang): New `keep-mtime?' parameter; call `set-file-time'
  when it's true.
  (patch-makefile-SHELL): Likewise.
 2012-12-31 01:17:43 +01:00