distro: Add the `guile', `typesetting', and `databases' package modules.
* distro.scm (package-files): Adjust PREFIX-LEN to use the top-level
directory, not %DISTRO-MODULE-DIRECTORY.
* distro/packages/base.scm (guile-reader, guile-reader/guile-1.8,
guile-reader/guile-2.0, lout, recutils): Move to...
* distro/packages/guile.scm, distro/packages/typesetting.scm,
distro/packages/databases.scm: ... here. New files.
* Makefile.am (MODULES): Add them.
(EXTRA_DIST): Add `.dir-locals.el'.
* .dir-locals.el: New file, with settings formerly in `base.scm'.
2012-09-26 22:17:41 +02:00
|
|
|
;; Per-directory local variables for GNU Emacs 23 and later.
|
|
|
|
|
|
2013-01-30 18:59:12 +01:00
|
|
|
((nil . ((fill-column . 78)
|
distro: Add the `guile', `typesetting', and `databases' package modules.
* distro.scm (package-files): Adjust PREFIX-LEN to use the top-level
directory, not %DISTRO-MODULE-DIRECTORY.
* distro/packages/base.scm (guile-reader, guile-reader/guile-1.8,
guile-reader/guile-2.0, lout, recutils): Move to...
* distro/packages/guile.scm, distro/packages/typesetting.scm,
distro/packages/databases.scm: ... here. New files.
* Makefile.am (MODULES): Add them.
(EXTRA_DIST): Add `.dir-locals.el'.
* .dir-locals.el: New file, with settings formerly in `base.scm'.
2012-09-26 22:17:41 +02:00
|
|
|
(tab-width . 8)))
|
|
|
|
|
(c-mode . ((c-file-style . "gnu")))
|
|
|
|
|
(scheme-mode
|
|
|
|
|
.
|
|
|
|
|
((indent-tabs-mode . nil)
|
2014-04-28 23:00:57 +02:00
|
|
|
(eval . (put 'eval-when 'scheme-indent-function 1))
|
2013-02-01 12:48:02 +01:00
|
|
|
(eval . (put 'test-assert 'scheme-indent-function 1))
|
|
|
|
|
(eval . (put 'test-equal 'scheme-indent-function 1))
|
2014-03-31 23:34:20 +02:00
|
|
|
(eval . (put 'test-eq 'scheme-indent-function 1))
|
2013-02-01 12:48:02 +01:00
|
|
|
(eval . (put 'call-with-input-string 'scheme-indent-function 1))
|
|
|
|
|
(eval . (put 'guard 'scheme-indent-function 1))
|
distro: Add the `guile', `typesetting', and `databases' package modules.
* distro.scm (package-files): Adjust PREFIX-LEN to use the top-level
directory, not %DISTRO-MODULE-DIRECTORY.
* distro/packages/base.scm (guile-reader, guile-reader/guile-1.8,
guile-reader/guile-2.0, lout, recutils): Move to...
* distro/packages/guile.scm, distro/packages/typesetting.scm,
distro/packages/databases.scm: ... here. New files.
* Makefile.am (MODULES): Add them.
(EXTRA_DIST): Add `.dir-locals.el'.
* .dir-locals.el: New file, with settings formerly in `base.scm'.
2012-09-26 22:17:41 +02:00
|
|
|
(eval . (put 'lambda* 'scheme-indent-function 1))
|
|
|
|
|
(eval . (put 'substitute* 'scheme-indent-function 1))
|
|
|
|
|
(eval . (put 'with-directory-excursion 'scheme-indent-function 1))
|
2013-10-29 17:19:44 +01:00
|
|
|
(eval . (put 'package 'scheme-indent-function 0))
|
2013-11-07 00:18:20 +01:00
|
|
|
(eval . (put 'origin 'scheme-indent-function 0))
|
build-system: Introduce "bags" as an intermediate representation.
* 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.
2014-10-03 18:06:16 +02:00
|
|
|
(eval . (put 'build-system 'scheme-indent-function 0))
|
|
|
|
|
(eval . (put 'bag 'scheme-indent-function 0))
|
2014-05-03 00:26:07 +02:00
|
|
|
(eval . (put 'operating-system 'scheme-indent-function 0))
|
|
|
|
|
(eval . (put 'file-system 'scheme-indent-function 0))
|
2013-11-01 23:11:17 +01:00
|
|
|
(eval . (put 'manifest-entry 'scheme-indent-function 0))
|
|
|
|
|
(eval . (put 'manifest-pattern 'scheme-indent-function 0))
|
2012-11-01 00:50:01 +01:00
|
|
|
(eval . (put 'substitute-keyword-arguments 'scheme-indent-function 1))
|
2014-01-19 23:03:43 +01:00
|
|
|
(eval . (put 'with-store 'scheme-indent-function 1))
|
2013-05-14 23:53:38 +02:00
|
|
|
(eval . (put 'with-error-handling 'scheme-indent-function 0))
|
2013-10-03 22:45:25 +02:00
|
|
|
(eval . (put 'with-mutex 'scheme-indent-function 1))
|
2013-12-29 15:51:07 +01:00
|
|
|
(eval . (put 'with-atomic-file-output 'scheme-indent-function 1))
|
2014-03-24 22:15:29 +01:00
|
|
|
(eval . (put 'call-with-compressed-output-port 'scheme-indent-function 2))
|
|
|
|
|
(eval . (put 'call-with-decompressed-port 'scheme-indent-function 2))
|
2014-03-31 23:34:20 +02:00
|
|
|
(eval . (put 'signature-case 'scheme-indent-function 1))
|
2014-08-03 01:24:50 +02:00
|
|
|
(eval . (put 'emacs-batch-eval 'scheme-indent-function 0))
|
|
|
|
|
(eval . (put 'emacs-batch-edit-file 'scheme-indent-function 1))
|
|
|
|
|
(eval . (put 'emacs-substitute-sexps 'scheme-indent-function 1))
|
|
|
|
|
(eval . (put 'emacs-substitute-variables 'scheme-indent-function 1))
|
2013-10-03 22:45:25 +02:00
|
|
|
|
|
|
|
|
(eval . (put 'syntax-parameterize 'scheme-indent-function 1))
|
|
|
|
|
(eval . (put 'with-monad 'scheme-indent-function 1))
|
2014-10-08 23:35:08 +02:00
|
|
|
(eval . (put 'mbegin 'scheme-indent-function 1))
|
2013-10-03 22:45:25 +02:00
|
|
|
(eval . (put 'mlet* 'scheme-indent-function 2))
|
|
|
|
|
(eval . (put 'mlet 'scheme-indent-function 2))
|
2014-04-28 23:00:57 +02:00
|
|
|
(eval . (put 'run-with-store 'scheme-indent-function 1))
|
|
|
|
|
|
gexp: Add 'ungexp-native' and 'ungexp-native-splicing'.
* guix/gexp.scm (<gexp>)[natives]: New field.
(write-gexp): Use both 'gexp-references' and
'gexp-native-references'.
(gexp->derivation): Use both 'gexp-inputs' and 'gexp-native-inputs',
and append them.
(gexp-inputs): Add 'references' parameter and honor it.
(gexp-native-inputs): New procedure.
(gexp->sexp)[reference->sexp]: Add 'native?' parameter and honor it.
Use it, and use 'gexp-native-references'.
(gexp)[collect-native-escapes]: New procedure.
[escape->ref]: Handle 'ungexp-native' and 'ungexp-native-splicing'.
[substitute-ungexp, substitute-ungexp-splicing]: New procedures.
[substitute-references]: Use them, and handle 'ungexp-native' and
'ungexp-native-splicing'.
Adjust generated 'make-gexp' call to provide both normal references
and native references.
[read-ungexp]: Support 'ungexp-native' and
'ungexp-native-splicing'.
Add reader extension for #+.
* tests/gexp.scm (gexp-native-inputs): New procedure.
(gexp->sexp*): Add 'target' parameter.
("ungexp + ungexp-native",
"input list + ungexp-native",
"input list splicing + ungexp-native-splicing",
"gexp->derivation, ungexp-native",
"gexp->derivation, ungexp + ungexp-native"): New tests.
("sugar"): Add tests for #+ and #+@.
* doc/guix.texi (G-Expressions): Document 'ungexp-native' et al.
2014-08-18 14:53:10 +02:00
|
|
|
;; Recognize '~', '+', and '$', as used for gexps, as quotation symbols.
|
|
|
|
|
;; This notably allows '(' in Paredit to not insert a space when the
|
|
|
|
|
;; preceding symbol is one of these.
|
2014-04-28 23:00:57 +02:00
|
|
|
(eval . (modify-syntax-entry ?~ "'"))
|
gexp: Add 'ungexp-native' and 'ungexp-native-splicing'.
* guix/gexp.scm (<gexp>)[natives]: New field.
(write-gexp): Use both 'gexp-references' and
'gexp-native-references'.
(gexp->derivation): Use both 'gexp-inputs' and 'gexp-native-inputs',
and append them.
(gexp-inputs): Add 'references' parameter and honor it.
(gexp-native-inputs): New procedure.
(gexp->sexp)[reference->sexp]: Add 'native?' parameter and honor it.
Use it, and use 'gexp-native-references'.
(gexp)[collect-native-escapes]: New procedure.
[escape->ref]: Handle 'ungexp-native' and 'ungexp-native-splicing'.
[substitute-ungexp, substitute-ungexp-splicing]: New procedures.
[substitute-references]: Use them, and handle 'ungexp-native' and
'ungexp-native-splicing'.
Adjust generated 'make-gexp' call to provide both normal references
and native references.
[read-ungexp]: Support 'ungexp-native' and
'ungexp-native-splicing'.
Add reader extension for #+.
* tests/gexp.scm (gexp-native-inputs): New procedure.
(gexp->sexp*): Add 'target' parameter.
("ungexp + ungexp-native",
"input list + ungexp-native",
"input list splicing + ungexp-native-splicing",
"gexp->derivation, ungexp-native",
"gexp->derivation, ungexp + ungexp-native"): New tests.
("sugar"): Add tests for #+ and #+@.
* doc/guix.texi (G-Expressions): Document 'ungexp-native' et al.
2014-08-18 14:53:10 +02:00
|
|
|
(eval . (modify-syntax-entry ?$ "'"))
|
|
|
|
|
(eval . (modify-syntax-entry ?+ "'"))))
|
distro: Add the `guile', `typesetting', and `databases' package modules.
* distro.scm (package-files): Adjust PREFIX-LEN to use the top-level
directory, not %DISTRO-MODULE-DIRECTORY.
* distro/packages/base.scm (guile-reader, guile-reader/guile-1.8,
guile-reader/guile-2.0, lout, recutils): Move to...
* distro/packages/guile.scm, distro/packages/typesetting.scm,
distro/packages/databases.scm: ... here. New files.
* Makefile.am (MODULES): Add them.
(EXTRA_DIST): Add `.dir-locals.el'.
* .dir-locals.el: New file, with settings formerly in `base.scm'.
2012-09-26 22:17:41 +02:00
|
|
|
(emacs-lisp-mode . ((indent-tabs-mode . nil)))
|
|
|
|
|
(texinfo-mode . ((indent-tabs-mode . nil)
|
|
|
|
|
(fill-column . 72))))
|