aboutsummaryrefslogtreecommitdiff
path: root/guix/build-system
Commit message (Collapse)AuthorAge
* packages: Implement grafts.Ludovic Courtès2014-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions and suggestions. * guix/packages.scm (<package>)[graft]: New field. (patch-and-repack): Invoke 'package-derivation' with #:graft? #f. (package-source-derivation): Likewise. Do not use (%guile-for-build) in call to 'patch-and-repack', and we could end up using a grafted Guile. (expand-input): Likewise, also for 'package-cross-derivation' call. (package->bag): Add #:graft? parameter. Honor it. Use 'strip-append' instead of 'package-full-name'. (input-graft, input-cross-graft, bag-grafts, package-grafts): New procedures. (package-derivation, package-cross-derivation): Add #:graft? parameter and honor it. * gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add recursive call on 'graft'. * guix/build-system/gnu.scm (package-with-explicit-inputs, package-with-extra-configure-variable, static-package): Likewise. (gnu-build): Use the ungrafted Guile to avoid full rebuilds. (gnu-cross-build): Likewise. * guix/build-system/cmake.scm (cmake-build): Likewise. * guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise. * guix/build-system/perl.scm (perl-build): Likewise. * guix/build-system/python.scm (python-build): Likewise. * guix/build-system/ruby.scm (ruby-build): Likewise. * guix/build-system/trivial.scm (guile-for-build): Likewise. * tests/packages.scm ("package-derivation, direct graft", "package-cross-derivation, direct graft", "package-grafts, indirect grafts", "package-grafts, indirect grafts, cross", "package-grafts, indirect grafts, propagated inputs", "package-derivation, indirect grafts"): New tests. ("bag->derivation", "bag->derivation, cross-compilation"): Wrap in 'parameterize'. * doc/guix.texi (Security Updates): New node. (Invoking guix build): Document --no-graft.
* build-system/gnu: Add #:substitutable? parameter.Ludovic Courtès2014-10-28
| | | | | | * guix/build-system/gnu.scm (gnu-build): Add #:substitutable? parameter. Pass #:local-build? to 'build-expression->derivation'. (gnu-cross-build): Likewise.
* gnu: Add the 'glib-or-gtk' build system.Federico Beffa2014-10-08
| | | | | | | | * guix/build-system/glib-or-gtk.scm, guix/build/glib-or-gtk-build-system.scm: New files. * Makefile.am (MODULES): Add them. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
* build-system/trivial: Preserve the cross-compilation target in bags.Ludovic Courtès2014-10-05
| | | | * guix/build-system/trivial.scm (lower): Initialize the 'target' field.
* build-system: Bags record their system and target.Ludovic Courtès2014-10-05
| | | | | | | | | | | | | | | | | | | | * guix/build-system.scm (<bag>)[system, target]: New fields. (make-bag): Add #:system parameter and pass it to LOWER. * gnu/packages/bootstrap.scm (make-raw-bag): Initialize 'system' field. * guix/build-system/cmake.scm (lower): Likewise. * guix/build-system/perl.scm (lower): Likewise. * guix/build-system/python.scm (lower): Likewise. * guix/build-system/ruby.scm (lower): Likewise. * guix/build-system/trivial.scm (lower): Likewise. * guix/build-system/gnu.scm (lower): Initialize 'system' and 'target' fields. * guix/packages.scm (bag->derivation, bag->cross-derivation): New procedures. (package-derivation, package-cross-derivation): Use 'bag->derivation'. * tests/packages.scm ("search paths"): Initialize 'system' and 'target' fields. ("package->bag", "package->bag, cross-compilation", "bag->derivation", "bag->derivation, cross-compilation"): New tests.
* build-system: Introduce "bags" as an intermediate representation.Ludovic Courtès2014-10-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * guix/build-system.scm (<build-system>)[build, cross-build]: Remove. [lower]: New field. (<bag>): New record type. (make-bag): New procedure. * guix/packages.scm (bag-transitive-inputs, bag-transitive-build-inputs, bag-transitive-host-inputs, bag-transitive-target-inputs, package->bag): New procedures. (package-derivation): Use it; use the bag, apply its build procedure, etc. (package-cross-derivation): Likewise. * gnu/packages/bootstrap.scm (raw-build, make-raw-bag): New procedure. (%bootstrap-guile): Use them. * guix/build-system/trivial.scm (lower): New procedure. (trivial-build, trivial-cross-build): Remove 'source' parameter. Pass INPUTS as is. (trivial-build-system): Adjust accordingly. * guix/build-system/gnu.scm (%store, inputs-search-paths, standard-search-paths, expand-inputs, standard-inputs): Remove. (gnu-lower): New procedure. (gnu-build): Remove 'source' and #:implicit-inputs? parameters. Remove 'implicit-inputs' and 'implicit-search-paths' variables. Get the source from INPUT-DRVS. (gnu-cross-build): Likewise. (standard-cross-packages): Remove call to 'standard-packages'. (standard-cross-inputs, standard-cross-search-paths): Remove. (gnu-build-system): Remove 'build' and 'cross-build'; add 'lower'. * guix/build-system/cmake.scm (lower): New procedure. (cmake-build): Remove 'source' and #:cmake parameters. Use INPUTS and SEARCH-PATHS as is. Get the source from INPUTS. * guix/build-system/perl.scm: Likewise. * guix/build-system/python.scm: Likewise. * guix/build-system/ruby.scm: Likewise. * gnu/packages/cross-base.scm (cross-gcc): Change "cross-linux-headers" to "linux-headers". (cross-libc)[xlinux-headers]: Pass #:implicit-cross-inputs? #f. Likewise. In 'propagated-inputs', change "cross-linux-headers" to "linux-headers". * guix/git-download.scm (git-fetch): Use 'standard-packages' instead of 'standard-inputs'. * tests/builders.scm ("gnu-build-system"): Remove use of 'build-system-builder'. ("gnu-build"): Remove 'source' and #:implicit-inputs? arguments to 'gnu-build'. * tests/packages.scm ("search paths"): Adjust to new build system API. ("package-cross-derivation, no cross builder"): Likewise. * doc/guix.texi (Build Systems): Add paragraph on bags.
* build-system: Remove irrelevant special case.Ludovic Courtès2014-10-05
| | | | | | | | | | | * guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Remove comment about case where GUILE is a derivation path. * guix/build-system/cmake.scm (cmake-build): Remove case where GUILE is a derivation path. * guix/build-system/perl.scm (perl-build): Likewise. * guix/build-system/python.scm (python-build): Likewise. * guix/build-system/ruby.scm (ruby-build): Likewise. * guix/build-system/trivial.scm (guile-for-build): Likewise.
* build-system/cmake: Add #:build-type parameter, default to "RelWithDebInfo".Ludovic Courtès2014-10-04
| | | | | | | | | * guix/build-system/cmake.scm (cmake-build): Add #:build-type. Pass it in BUILDER. * guix/build/cmake-build-system.scm (configure): Add #:build-type parameter and honor it. * doc/guix.texi (Build Systems): Document #:configure-flags and #:build-type for CMake.
* build: Add ruby build system.David Thompson2014-09-28
| | | | | | | * guix/build-system/ruby.scm: New file. * guix/build/ruby-build-system: New file. * Makefile.am (MODULES): Add new files. * doc/guix.texi (Build Systems): Document ruby-build-system.
* gnu: Split (gnu packages base), adding (gnu packages commencement).Ludovic Courtès2014-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/base.scm (gnu-make-boot0, diffutils-boot0, findutils-boot0, %boot0-inputs, nix-system->gnu-triplet, boot-triplet, binutils-boot0, gcc-boot0, perl-boot0, linux-libre-headers-boot0, texinfo-boot0, %boot1-inputs, glibc-final-with-bootstrap-bash, cross-gcc-wrapper, static-bash-for-glibc, glibc-final, gcc-boot0-wrapped, %boot2-inputs, binutils-final, libstdc++, gcc-final, ld-wrapper-boot3, %boot3-inputs, bash-final, %boot4-inputs, guile-final, gnu-make-final, ld-wrapper, coreutils-final, grep-final, %boot5-inputs, %final-inputs, canonical-package, gcc-toolchain, gcc-toolchain-4.8, gcc-toolchain-4.9): Move to... * gnu/packages/commencement.scm: ... here. New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. * build-aux/check-final-inputs-self-contained.scm: Adjust accordingly. * gnu/packages/cross-base.scm: Likewise. * gnu/packages/make-bootstrap.scm: Likewise. * guix/build-system/cmake.scm (cmake-build): Likewise. * guix/build-system/gnu.scm (standard-packages, gnu-build, gnu-cross-build): Likewise. * guix/build-system/perl.scm (perl-build): Likewise. * guix/build-system/python.scm (python-build): Likewise. * guix/build-system/trivial.scm (guile-for-build): Likewise. * guix/download.scm (url-fetch): Likewise. * guix/gexp.scm (default-guile): Likewise. * guix/git-download.scm (git-fetch): Likewise. * guix/monads.scm (run-with-store): Likewise. * guix/packages.scm (default-guile): Likewise. * guix/scripts/package.scm (guix-package): Likewise. * guix/scripts/refresh.scm: Likewise. * guix/svn-download.scm (svn-fetch): Likewise. * tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths): Likewise. * tests/packages.scm ("GNU Make, bootstrap"): Likewise. * tests/guix-package.sh: Likewise. * gnu/services/base.scm: Use 'canonical-package' instead of xxx-final. * gnu/services/xorg.scm: Likewise. * gnu/system/vm.scm: Likewise. * guix/scripts/pull.scm (guix-pull): Likewise.
* build-system/perl: Add handling of flags for parallel build and testing.Andreas Enge2014-08-27
| | | | | | * guix/build-system/perl.scm (perl-build): Add support for variables parallel-build? and parallel-tests?. * guix/build-system/gnu.scm (gnu-build): Add a line break for clarity.
* Add comments about global memoization.Ludovic Courtès2014-07-21
| | | | | | * guix/build-system/gnu.scm (standard-inputs): Add comment about misplaced memoization. * guix/packages.scm (cache): Likewise.
* build-system/gnu: Add 'package-with-restricted-references'.Ludovic Courtès2014-06-07
| | | | | * guix/build-system/gnu.scm (package-with-restricted-references): New procedure.
* build-system/gnu: Add #:allowed-references.Ludovic Courtès2014-06-06
| | | | | | | * guix/build-system/gnu.scm (gnu-build): Add #:allowed-references. [canonicalize-reference]: New procedure. Pass #:allowed-references to 'build-expression->derivation'. (gnu-cross-build): Likewise.
* build-system/perl: Honour phases argument in perl build system.Andreas Enge2013-12-09
| | | | | * guix/build-system/perl.scm (perl-build): Propagate phases argument to builder.
* build-system/gnu: Fix reference to Gettext in 'dist-package'.Ludovic Courtès2013-12-04
| | | | | * guix/build-system/gnu.scm (dist-package): Change 'gettext' to 'gnu-gettext'.
* derivations: Use more keyword parameters for 'build-expression->derivation'.Ludovic Courtès2013-12-04
| | | | | | | | | | | | | | | | | * guix/derivations.scm (build-expression->derivation): Turn 'system' and 'inputs' into keyword parameters. Adjust callers accordingly. * gnu/system/linux.scm, gnu/system/vm.scm, guix/build-system/cmake.scm, guix/build-system/gnu.scm, guix/build-system/perl.scm, guix/build-system/python.scm, guix/build-system/trivial.scm, guix/download.scm, guix/packages.scm, guix/profiles.scm, guix/scripts/pull.scm, tests/derivations.scm, tests/guix-build.sh, tests/monads.scm, tests/store.scm, tests/union.scm: Adjust users of 'build-expression->derivation' and 'derivation-expression' accordingly. * doc/guix.texi (Derivations): Adjust 'build-expression->derivation' documentation accordingly. (The Store Monad): Likewise for 'derivation-expression'.
* build-system/cmake: Build out of source tree by default.Ludovic Courtès2013-11-28
| | | | | | | * guix/build-system/cmake.scm (cmake-build): Change 'out-of-source?' to default to #t. * guix/build/cmake-build-system.scm (configure): Add 'out-of-source?' keyword parameter and honor it.
* Merge branch 'master' into core-updatesLudovic Courtès2013-11-20
|\ | | | | | | | | Conflicts: guix/packages.scm
| * build-system/python: Add #:test-target parameter.Ludovic Courtès2013-11-20
| | | | | | | | | | * guix/build-system/python.scm (python-build): Add #:test-target parameter. Reported by Eric Bavier <ericbavier@gmail.com>.
* | Merge branch 'master' into core-updatesLudovic Courtès2013-11-01
|\|
| * build-system/{cmake,perl}: Don't use (guix build gnu-build-system).Ludovic Courtès2013-10-29
| | | | | | | | | | | | | | | | | | Previously references to '%standard-phases' in builder-side code would refer to the wrong one. * guix/build-system/cmake.scm (cmake-build): Remove (guix build gnu-build-system) from the default MODULES value. * guix/build-system/perl.scm (perl-build): Likewise.
| * build-system/perl: Lazily resolve (gnu packages perl).Ludovic Courtès2013-10-12
| | | | | | | | | | * guix/build-system/perl.scm (default-perl): New procedure. (perl-build): Use it.
* | build-system/{gnu,cmake}: Remove #:patches and #:patch-flags parameters.Ludovic Courtès2013-10-10
|/ | | | | | | | | | * guix/build/gnu-build-system.scm (patch): Remove. (%standard-phases): Remove 'patch'. * guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Remove #:patches and #:patch-flags parameters. * guix/build-system/cmake.scm (cmake-build): Likewise. * guix/build-system/python.scm (package-with-explicit-python): Update comment.
* build-system/trivial: Take the 'source' field into account.Ludovic Courtès2013-09-27
| | | | | | | * guix/build-system/trivial.scm (trivial-build): When SOURCE is true, add it to INPUTS. (trivial-cross-build): Likewise. * tests/packages.scm ("trivial with source"): New test.
* derivations: 'derivation' and related procedures return a single value.Ludovic Courtès2013-09-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * guix/derivations.scm (derivation->output-path, derivation->output-paths): New procedures. (derivation-path->output-path): Use 'derivation->output-path'. (derivation-path->output-paths): Use 'derivation->output-paths'. (derivation): Accept 'derivation?' objects as inputs. Return a single value. (build-derivations): New procedure. (compiled-modules): Use 'derivation->output-paths'. (build-expression->derivation)[source-path]: Add case for when the input matches 'derivation?'. [prologue]: Accept 'derivation?' objects in INPUTS. [mod-dir, go-dir]: Use 'derivation->output-path'. * guix/download.scm (url-fetch): Adjust to the single-value return. * guix/packages.scm (package-output): Use 'derivation->output-path'. * guix/scripts/build.scm (guix-build): When the argument is 'derivation-path?', pass it through 'read-derivation'. Use 'derivation-file-name' to print out the .drv file names, and to register them. Use 'derivation->output-path' instead of 'derivation-path->output-path'. * guix/scripts/package.scm (roll-back): Adjust to the single-value return. (guix-package): Use 'derivation->output-path'. * guix/ui.scm (show-what-to-build): Adjust to deal with 'derivation?' objects instead of .drv file names. * gnu/system/grub.scm (grub-configuration-file): Use 'derivation->output-path' instead of 'derivation-path->output-path'. * gnu/system/vm.scm (qemu-image, system-qemu-image): Likewise. * tests/builders.scm, tests/derivations.scm, tests/packages.scm, tests/store.scm, tests/union.scm: Adjust to the new calling convention. * doc/guix.texi (Defining Packages, The Store, Derivations): Adjust accordingly.
* Merge branch 'python'Andreas Enge2013-09-14
|\
| * guix: python: Do not import %standard-phases from gnu-build-system.Andreas Enge2013-09-10
| | | | | | | | | | * guix/build-system/python.scm (python-build): Drop module gnu-build-system. Thanks to Ludovic Courtès <ludo@gnu.org>.
| * guix: python: Add parameter #:phases to build system.Andreas Enge2013-09-10
| | | | | | | | * guix/build-system/python.scm (python-build): Use parameter #:phases.
| * guix: python: Add package-with-python2, a procedure rewriting a packageAndreas Enge2013-09-08
| | | | | | | | | | | | | | | | | | to compile with Python 2 instead of the default Python 3. * guix/build-system/python.scm (default-python2, package-with-explicit-python, package-with-python2): New procedures. * guix/build-system/python.scm (python2-pytz, python2-babel): Use package-with-python2.
| * guix: python: Switch to python-wrapper as the default version for the pythonAndreas Enge2013-09-04
| | | | | | | | | | | | | | | | | | build system (switches to Python 3) and compute python-version instead of passing it as a parameter. * guix/build-system/python.scm (default-python): Switch to python-wrapper. * guix/build-system/python.scm (python-build): Drop parameter #:python-version. * guix/build/python-build-system.scm (wrap): Compute python version from input.
* | build-system/cmake: Fix typo.Ludovic Courtès2013-09-03
| | | | | | | | * guix/build-system/cmake.scm (default-cmake): Add missing quote.
* | build-system/gnu: Delay resolution of (@ (gnu packages cmake) cmake).Ludovic Courtès2013-09-03
|/ | | | | * guix/build-system/cmake.scm (default-cmake): New procedure. (cmake-build): Use it.
* build-system/gnu: Add `dist-package'.Ludovic Courtès2013-08-24
| | | | | | | | * guix/build/gnu-dist.scm: New file. * Makefile.am (MODULES): Add it. * guix/build-system/gnu.scm (%default-modules): New variable. (gnu-build): Use it. (dist-package): New procedure.
* build-system/gnu: Remove the "debug" output when `strip-binaries?' is #f.Ludovic Courtès2013-07-04
| | | | | | | * guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Delete "debug" from OUTPUTS when STRIP-BINARIES? is false. * gnu/packages/cross-base.scm (cross-libc): Leave `outputs' unchanged. This reverts commit a4627d4.
* build-system/gnu: `package-with-explicit-inputs' skips non-GBS packages.Ludovic Courtès2013-06-25
| | | | | * guix/build-system/gnu.scm (package-with-explicit-inputs)[rewritten-input]: Leave P unchanged if its build system is not GNU-BUILD-SYSTEM.
* build-system/gnu: Augment `package-with-explicit-inputs' for cross builds.Ludovic Courtès2013-06-25
| | | | | | * guix/build-system/gnu.scm (package-with-explicit-inputs): Add `native-inputs' keyword parameter. Allow INPUTS and NATIVE-INPUTS to be thunks.
* build-system/trivial: Don't bind `%target' in the builder.Ludovic Courtès2013-06-25
| | | | | | | * guix/build-system/trivial.scm (trivial-cross-build): Don't bind `%target' here since this causes problem when BUILDER contains (use-modules ...) clauses, and can be achieved differently anyway.
* build-system/gnu: Disable test suite when cross building.Ludovic Courtès2013-06-24
| | | | | * guix/build-system/gnu.scm (gnu-cross-build): Change #:tests? to default to #f.
* build-system/gnu: Unify with (guix build-system gnu-cross-build).Ludovic Courtès2013-06-21
| | | | | | | | | | | | | | | | | | | * guix/build/gnu-build-system.scm (set-paths): Add `native-inputs' and `native-search-paths' keyword parameters. Honor them. (configure): Add `target' and `native-inputs' keyword parameters. Look for Bash in NATIVE-INPUTS or INPUTS. Pass `--host' when TARGET is true. (strip): Add `strip-command' keyword parameter. Use it. * guix/build/gnu-cross-build.scm: Remove. * Makefile.am (MODULES): Adjust accordingly. * gnu/packages/acl.scm, gnu/packages/attr.scm, gnu/packages/base.scm, gnu/packages/bash.scm, gnu/packages/gawk.scm, gnu/packages/gettext.scm, gnu/packages/guile.scm, gnu/packages/libffi.scm, gnu/packages/libsigsegv.scm, gnu/packages/linux.scm, gnu/packages/ncurses.scm, gnu/packages/readline.scm, guix/build-system/gnu.scm: Replace `%standard-cross-phases' by `%standard-phases'. Remove references to (guix build gnu-cross-build).
* build-system/trivial: Fix introduction of `%target' when cross-building.Ludovic Courtès2013-06-15
| | | | | * guix/build-system/trivial.scm (trivial-cross-build): Wrap BUILDER in a `let' rather than in `begin'.
* gnu: Fix `static-package' arguments overriding.Ludovic Courtès2013-06-05
| | | | | | * guix/build-system/gnu.scm (static-package): Call `package-arguments' from within the `arguments' field, so it see the right (%current-target-system).
* build-system/python: Avoid circular dependency.Ludovic Courtès2013-05-30
| | | | | | | | This fixes a circular dependency introduced in commit acc26ff ("gnu: Add pytz."). * guix/build-system/python.scm (default-python): New procedure. (python-build): Use it.
* build-system/gnu: Fix typo in `gnu-cross-build'.Ludovic Courtès2013-05-27
| | | | | * guix/build-system/gnu.scm (gnu-cross-build)[builder]: When IMPLICIT-TARGET-INPUTS is #f, default to '().
* build-system/gnu: Make sure build input variables contain pairs.Ludovic Courtès2013-05-25
| | | | | | * guix/build-system/gnu.scm (gnu-cross-build)[builder]: Make sure %build-host-inputs and %build-target-inputs always contain pairs, not lists.
* build-system/trivial: Implement the cross-build protocol.Ludovic Courtès2013-05-24
| | | | | | | * guix/build-system/trivial.scm (guile-for-build): New procedure. (trivial-build): Use it. (trivial-cross-build): New procedure. (trivial-build-system): Use it.
* build-system/gnu: Implement cross build.Ludovic Courtès2013-05-24
| | | | | | | | | | | | | | * guix/build-system/gnu.scm (inputs-search-paths): New procedure. (standard-search-paths): Use it. (expand-inputs): New procedure. (standard-inputs): Use it. (standard-cross-packages, standard-cross-inputs, standard-cross-search-paths, gnu-cross-build): New procedures. (gnu-build-system): Set `cross-build' field to `gnu-cross-build'. * gnu/packages/cross-base.scm: Export `cross-gcc', `cross-binutils', and `cross-libc'. * guix/build/gnu-cross-build.scm: New file. * Makefile.am (MODULES): Add it.
* Add 'python-build-system'.Nikita Karetnikov2013-05-08
| | | | | * guix/build-system/python.scm, guix/build/python-build-system.scm: New files. * Makefile.am (MODULES): Add them.
* build-system/{perl,cmake}: Keep the standard search paths of gnu-build-system.Ludovic Courtès2013-04-16
| | | | | | | | | | | Reported by Andreas Enge <andreas@enge.fr>. * guix/build-system/gnu.scm (standard-search-paths): New procedure. (gnu-build): Use it. * guix/build-system/perl.scm (perl-build): Append (standard-search-paths) to the search paths of PERL. * guix/build-system/cmake.scm (cmake-build): Append (standard-search-paths) to SEARCH-PATHS.
* build-system/gnu: Fix search path computation with implicit inputs.Ludovic Courtès2013-04-09
| | | | | | | | | Reported by Andreas Enge <andreas@enge.fr>. * guix/build-system/gnu.scm (standard-packages): New procedure. (standard-inputs): Use it instead of resolving things locally. (gnu-build)[implicit-search-paths]: Map over (standard-packages), not over STANDARD-INPUTS.
generated by cgit v1.2.3 (git 2.45.0) at 2024-12-30 21:13:54 +0000