summaryrefslogtreecommitdiff
path: root/guix/build/utils.scm
AgeCommit message (Collapse)Author
2015-01-09build-system/gnu: Patch /usr/bin/file in all 'configure' files.Ludovic Courtès
* guix/build/utils.scm (patch-/usr/bin/file): New procedure. * guix/build/gnu-build-system.scm (patch-usr-bin-file): Rewrite using it. Patch all the files returned by 'find-files' that are executable. * gnu/packages/gawk.scm (gawk)[arguments]: Remove use of 'substitute*' for 'extension/configure'.
2014-12-27utils: Export 'search-path-as-list'.Ludovic Courtès
* guix/build/utils.scm (search-path-as-list): Make public. * guix/scripts/environment.scm (for-each-search-path): Use it.
2014-12-27build-support/gnu: Add support for file patterns in search paths.Ludovic Courtès
* guix/build/utils.scm (search-path-as-list): Add #:pattern parameter and honor it. (set-path-environment-variable): Likewise, and pass it to 'search-path-as-list'. * guix/packages.scm (search-path-specification->sexp): Add PATTERN slot. * guix/build/gnu-build-system.scm (set-paths): Adjust accordingly.
2014-12-27build-system/gnu: Add support for non-directory search paths.Ludovic Courtès
Partly fixes <http://bugs.gnu.org/18033>. * guix/build/utils.scm (search-path-as-list): Rename 'sub-directories' parameter to 'files'. Add #:type parameter and honor it. (set-path-environment-variable): Likewise. Pass #:type to 'search-path-as-list'. * guix/packages.scm (search-path-specification->sexp): Add 'directory as the last item of the tuple. * guix/build/gnu-build-system.scm (set-paths): Add 'type' to search-path pattern. Pass #:type to 'set-path-environment-variable'.
2014-12-14utils: Change 'wrap-program' to preserve the original argv[0].Ludovic Courtès
Suggested by Mark H Weaver <mhw@netris.org> in <http://bugs.gnu.org/19138>. * guix/build/utils.scm (wrap-program): Change wrapper to use "exec -a PROG" instead of just "exec".
2014-12-13utils: Change 'patch-makefile-SHELL' to support ":=" assignments.Ludovic Courtès
Reported by Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>. * guix/build/utils.scm (patch-makefile-SHELL): Update regexp to match ":=" assignments.
2014-12-13utils: Use 'which' to find the shell in 'patch-makefile-SHELL'.Ludovic Courtès
* guix/build/utils.scm (patch-makefile-SHELL)[find-shell]: Use 'which'.
2014-12-01utils: Add 'symbolic-link?'.Ludovic Courtès
* guix/build/utils.scm (symbolic-link?): New procedure.
2014-11-26utils: Improve docstring of 'substitute*' & co.Taylan Ulrich Bayırlı/Kammer
* guix/build/utils.scm (substitute): Clarify first sentence of docstring and add warning to the docstring about using '$' to match an end of line. (substitute*): Add warning to the docstring about using '$' to match an end of line. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-11-23utils: 'elf-file?' and 'ar-file?' return #f for directories.Ludovic Courtès
This avoids uncaught exceptions when the 'strip' phase would call these procedures on symlinks to directories, such as 'lib/terminfo' in ncurses (see <http://hydra.gnu.org/build/167310/nixlog/1/tail-reload>.) * guix/build/utils.scm (file-header-match): Catch 'system-error', and return #f upon EISDIR.
2014-11-22utils: Turn 'parallel-job-count' into a parameter.Ludovic Courtès
* guix/build/utils.scm (parallel-job-count): Turn into a SRFI-39 parameter.
2014-11-22utils: Factorize magic bytes detection.Ludovic Courtès
* guix/build/utils.scm (file-header-match): New procedure. (%elf-magic-bytes): New variable. (elf-file?, ar-file?): Define using 'file-header-match'.
2014-11-22utils: Add 'ar-file?'.Ludovic Courtès
* guix/build/utils.scm (%ar-magic-bytes): New variable. (ar-file?): New procedure.
2014-11-22utils: Add 'elf-file?'.Ludovic Courtès
* guix/build/utils.scm (elf-file?): New procedure.
2014-11-22utils: Export 'parallel-job-count'.Ludovic Courtès
* guix/build/utils.scm (parallel-job-count): New procedure. * guix/build/gnu-build-system.scm (%parallel-job-count): Remove. (build, check): Use 'parallel-job-count' instead.
2014-09-14utils: Import (ice-9 format).Mark H Weaver
* guix/build/utils.scm: Import (ice-9 format).
2014-09-13utils: Allow wrap-program to be called multiple times.Eric Bavier
* guix/build/utils.scm (wrap-program): Multiple invocations of wrap-program for the same file create successive wrappers. Adjust docstring. * tests/build-utils.scm: Test new wrap-program behavior. (%store): New variable.
2014-09-05utils: Clean trailing whitespace at end of SHELLEric Bavier
* guix/build/utils.scm (patch-makefile-SHELL): Remove trailing whitespace.
2014-08-28utils: Preserve makefile shell arguments during patch.Eric Bavier
* guix/build/utils.scm (patch-makefile-SHELL): Preserve shell arguments.
2014-05-20utils: 'delete-file-recursively' doesn't follow mount points by default.Ludovic Courtès
* guix/build/utils.scm (delete-file-recursively): Add #:follow-mounts? parameter and honor it.
2014-04-14build-system/gnu: Reset timestamps on build tree when source is a directory.Ludovic Courtès
* guix/build/utils.scm (copy-recursively): Add #:keep-mtime? parameter and honor it. * guix/build/gnu-build-system.scm (unpack): Use #:keep-mtime? #t. * gnu/packages/admin.scm (shadow)[arguments]: Remove 'reset-timestamps' phase.
2014-03-10Change default store values from /nix/store to /gnu/store.Ludovic Courtès
* gnu/packages/ld-wrapper.scm (%store-directory): Change the default to /gnu/store. * guix/build/utils.scm (%store-directory): New procedure. (remove-store-references): Use it for the default value of 'store'. * guix/packages.scm (patch-and-repack)[builder]: Change default store to /gnu/store.
2013-10-16utils: 'find-files' always returns a proper list.Ludovic Courtès
Reported at <http://bugs.gnu.org/15608>. * guix/build/utils.scm (find-files): Change the 'error' procedure to return RESULT. Before we would end up with an improper list.
2013-09-15utils: 'find-files' returns a sorted list.Ludovic Courtès
* guix/build/utils.scm (find-files): Sort the result lexicographically. * guix/scripts/pull.scm (unpack): Don't sort the result of 'find-files'.
2013-07-03utils: Re-export `alist-cons' and `alist-delete'.Ludovic Courtès
* guix/build/utils.scm: Re-export `alist-cons' and `alist-delete'.
2013-06-22utils: `set-path-environment-variable' calls `unsetenv' for empty values.Ludovic Courtès
* guix/build/utils.scm (set-path-environment-variable): When VALUE is the empty string, call `unsetenv' instead of `setenv'. * gnu/packages/guile.scm (guile-2.0)[arguments]: Remove `unsetenv' trick.
2013-04-30utils: Adjust 'wrap-program'.Nikita Karetnikov
* guix/build/utils.scm (wrap-program): Fix computation of PROG-REAL and PROG-TMP when PROG is an absolute file name. Add "$@" in the generated script, and quote PROG-REAL. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2013-03-07utils: Add 'wrap-program'.Nikita Karetnikov
* guix/build/utils.scm (wrap-program): New procedure.
2013-03-05utils: Add a #:follow-symlinks? parameter to `copy-recursively'.Ludovic Courtès
* guix/build/utils.scm (copy-recursively): Turn `log' into a keyword parameter. Add the `follow-symlinks?' parameter and honor it.
2013-03-05utils: Add `delete-file-recursively'.Ludovic Courtès
* guix/build/utils.scm (delete-file-recursively): New procedure.
2013-02-23Patch-shebang: Do not add space after interpreter without argument.Andreas Enge
* guix/build/utils.scm (patch-shebang): Do not add a space after a command interpreter not followed by an argument; this made two tests of coreutils fail.
2013-02-23Patch-shebang: Handle "#!/usr/bin/env command"Andreas Enge
* guix/build/utils.scm (patch-shebang): Handle replacement of "#!.*/env CMD ARGS" by "#!/nix/store/path/.../to/CMD ARGS".
2013-01-05Update license headers of builder-side code.Ludovic Courtès
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-05utils: Add `which'.Ludovic Courtès
* 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-01utils: Use binary I/O primitives for `remove-store-references'.Ludovic Courtès
* guix/build/utils.scm (fold-port-matches)[get-char]: New procedure. (remove-store-references): Use `put-u8' and `put-bytevector'.
2012-12-31utils: Restore the mtime/atime of patched files.Ludovic Courtès
* 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-21build-system/gnu: Patch shebangs in all the source; patch SHELL in makefiles.Ludovic Courtès
* 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-20utils: Add a `progress' parameter to `dump-port'.Ludovic Courtès
* guix/build/utils.scm (dump-port): Add a `progress' keyword parameter. Call it after each transfer.
2012-12-15build-system/gnu: Patch shebangs in executable source files.Ludovic Courtès
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-15utils: Make the buffer size of `dump-port' a parameter.Ludovic Courtès
* guix/build/utils.scm (dump-port): Make `buffer-size' a keyword parameter.
2012-10-26utils: Remove special `substitute*' syntax for lists of files.Ludovic Courtès
* 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-17utils: Add `find-files'.Ludovic Courtès
* guix/build/utils.scm (find-files): New procedure.
2012-10-17utils: Add `copy-recursively'; use it.Ludovic Courtès
* guix/build/utils.scm (copy-recursively): New procedure. * distro/packages/base.scm (%guile-static-stripped): Use it.
2012-10-17utils: Add `mkdir-p'; use it.Ludovic Courtès
* 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-16utils: Add `fold-port-matches' and `remove-store-references'.Ludovic Courtès
* 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-16utils: Add `with-atomic-file-replacement'.Ludovic Courtès
* guix/build/utils.scm (with-atomic-file-replacement): New procedure. (substitute): Use it.
2012-09-06utils: Make `set-path-environment-variable' verbose.Ludovic Courtès
* guix/build/utils.scm (set-path-environment-variable): Print ENV-VAR and its value.
2012-09-01utils: Change `substitute*' to allow iteration over several matches.Ludovic Courtès
* 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-08-25utils: Change `substitute*' to accept a list of files to patch.Ludovic Courtès
* guix/build/utils.scm (substitute*): Support a list of files as the first argument.
2012-08-19utils: Add a `path' argument to `patch-shebang'.Ludovic Courtès
* 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.
generated by cgit v1.2.3 (git 2.46.0) at 2024-08-26 14:35:39 +0000