2013-01-06 00:47:50 +01:00
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
gnu: Split (gnu packages base), adding (gnu packages commencement).
* 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.
2014-08-27 00:25:17 +02:00
|
|
|
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
2012-09-10 22:47:10 +02:00
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
;;; This file is part of GNU Guix.
|
2012-09-10 22:47:10 +02:00
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
2012-09-10 22:47:10 +02:00
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
;;; your option) any later version.
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
2012-09-10 22:47:10 +02:00
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
;;;
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
2013-01-06 00:47:50 +01:00
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
2012-09-10 22:47:10 +02:00
|
|
|
|
|
|
|
(define-module (guix build-system trivial)
|
|
|
|
#:use-module (guix store)
|
|
|
|
#:use-module (guix utils)
|
|
|
|
#:use-module (guix derivations)
|
2012-10-06 01:24:46 +02:00
|
|
|
#:use-module (guix packages)
|
2012-09-10 22:47:10 +02:00
|
|
|
#:use-module (guix build-system)
|
2012-10-06 01:24:46 +02:00
|
|
|
#:use-module (ice-9 match)
|
2012-09-10 22:47:10 +02:00
|
|
|
#:export (trivial-build-system))
|
|
|
|
|
2013-05-24 23:53:06 +02:00
|
|
|
(define (guile-for-build store guile system)
|
|
|
|
(match guile
|
|
|
|
((? package?)
|
|
|
|
(package-derivation store guile system))
|
|
|
|
((and (? string?) (? derivation-path?))
|
|
|
|
guile)
|
|
|
|
(#f ; the default
|
gnu: Split (gnu packages base), adding (gnu packages commencement).
* 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.
2014-08-27 00:25:17 +02:00
|
|
|
(let* ((distro (resolve-interface '(gnu packages commencement)))
|
2013-05-24 23:53:06 +02:00
|
|
|
(guile (module-ref distro 'guile-final)))
|
|
|
|
(package-derivation store guile system)))))
|
|
|
|
|
2012-09-10 22:47:10 +02:00
|
|
|
(define* (trivial-build store name source inputs
|
2013-03-30 22:56:38 +01:00
|
|
|
#:key
|
|
|
|
outputs guile system builder (modules '())
|
|
|
|
search-paths)
|
2012-09-10 22:47:10 +02:00
|
|
|
"Run build expression BUILDER, an expression, for SYSTEM. SOURCE is
|
|
|
|
ignored."
|
derivations: Use more keyword parameters for 'build-expression->derivation'.
* 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'.
2013-12-04 16:07:36 +01:00
|
|
|
(build-expression->derivation store name builder
|
|
|
|
#:inputs (if source
|
|
|
|
`(("source" ,source) ,@inputs)
|
|
|
|
inputs)
|
|
|
|
#:system system
|
2012-09-10 22:47:10 +02:00
|
|
|
#:outputs outputs
|
2012-10-06 01:24:46 +02:00
|
|
|
#:modules modules
|
2013-05-24 23:53:06 +02:00
|
|
|
#:guile-for-build
|
|
|
|
(guile-for-build store guile system)))
|
|
|
|
|
|
|
|
(define* (trivial-cross-build store name target source inputs native-inputs
|
|
|
|
#:key
|
|
|
|
outputs guile system builder (modules '())
|
|
|
|
search-paths native-search-paths)
|
|
|
|
"Like `trivial-build', but in a cross-compilation context."
|
derivations: Use more keyword parameters for 'build-expression->derivation'.
* 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'.
2013-12-04 16:07:36 +01:00
|
|
|
(build-expression->derivation store name builder
|
|
|
|
#:system system
|
|
|
|
#:inputs
|
2013-09-26 21:50:05 +02:00
|
|
|
(let ((inputs (append native-inputs inputs)))
|
|
|
|
(if source
|
|
|
|
`(("source" ,source) ,@inputs)
|
|
|
|
inputs))
|
2013-05-24 23:53:06 +02:00
|
|
|
#:outputs outputs
|
|
|
|
#:modules modules
|
|
|
|
#:guile-for-build
|
|
|
|
(guile-for-build store guile system)))
|
2012-09-10 22:47:10 +02:00
|
|
|
|
|
|
|
(define trivial-build-system
|
|
|
|
(build-system (name 'trivial)
|
|
|
|
(description
|
|
|
|
"Trivial build system, to run arbitrary Scheme build expressions")
|
|
|
|
(build trivial-build)
|
2013-05-24 23:53:06 +02:00
|
|
|
(cross-build trivial-cross-build)))
|