mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-18 20:57:12 -05:00
7d873f194c
* guix/packages.scm (expand-input): Remove 'store', 'system', and 'cross-system' parameters; add #:native?. Rewrite to return name/gexp-input tuples. (bag->derivation): Adjust accordingly. Lower (bag-build bag). (bag->cross-derivation): Ditto. Instead of #:native-drvs and #:target-drvs, pass #:build-inputs, #:host-inputs, and #:target-inputs. (%derivation-cache): Remove. * gnu/packages/bootstrap.scm (raw-build): Turn into a monadic procedure. * gnu/packages/commencement.scm (glibc-final)[arguments]: Use 'gexp-input' for the #:allowed-references argument. * guix/build-system/cmake.scm (cmake-build): Remove 'store' parameter. Switch to the use of gexps and 'gexp->derivation'. (lower): Remove #:source from 'private-keywords'. * guix/build-system/glib-or-gtk.scm (glib-or-gtk-build, lower): Likewise. * guix/build-system/font.scm (font-build): Likewise. * guix/build-system/gnu.scm (gnu-build): Likewise, and remove 'canonicalize-reference'. (gnu-cross-build): Likewise, and expect #:build-inputs, #:host-inputs, and #:target-inputs instead of #:native-drvs and #:target-drvs. (lower): Likewise. * guix/build-system/perl.scm (perl-build, lower): Likewise. * guix/build-system/python.scm (python-build, lower): Likewise. * guix/build-system/ruby.scm (ruby-build, lower): Likewise. * guix/build-system/waf.scm (waf-build, lower): Likewise. * guix/build-system/trivial.scm (guile-for-build): Remove. (trivial-build): Remove 'store' parameter, change to gexps. (trivial-cross-build): Ditto, and change to #:build-inputs & co. * guix/build-system/cargo.scm (cargo-build): Change to 'gexp->derivation'. * guix/build-system/copy.scm (copy-build): Likewise. * guix/build-system/dune.scm (dune-build): Likewise. * guix/build-system/guile.scm (guile-build, guile-cross-build): Likewise. * guix/build-system/meson.scm (meson-build): Likewise. * guix/build-system/ocaml.scm (ocaml-build): Likewise. * guix/build-system/scons.scm (scons-build): Likewise. * guix/build-system/texlive.scm (texlive-build): Likewise. * guix/build-system/android-ndk.scm (android-ndk-build): Likewise. * guix/build-system/ant.scm (ant-build): Likewise. * guix/build-system/asdf.scm (asdf-build/source, asdf-build): Likewise. * guix/build-system/chicken.scm (chicken-build): Likewise. * guix/build-system/clojure.scm (clojure-build): Likewise. (source->output-path, maybe-guile->guile): Remove. * guix/build-system/dub.scm (dub-build): Likewise. * guix/build-system/emacs.scm (emacs-build): Likewise. * guix/build-system/go.scm (go-build): Likewise. * guix/build-system/haskell.scm (haskell-build): Likewise. * guix/build-system/julia.scm (julia-build): Likewise. * guix/build-system/linux-module.scm (linux-module-build) (linux-module-build-cross): Likewise. * guix/build-system/maven.scm (maven-build): Likewise. * guix/build-system/minify.scm (minify-build): Likewise. * guix/build-system/node.scm (node-build): Likewise. * guix/build-system/qt.scm (qt-build, qt-cross-build): Likewise. * guix/build-system/r.scm (r-build): Likewise. * guix/build-system/rakudo.scm (rakudo-build): Likewise. * guix/build-system/renpy.scm (renpy-build): Likewise. * tests/builders.scm ("gnu-build"): Call 'store-lower' on 'gnu-build'. Pass #:source parameter. * tests/packages.scm ("search paths"): Use 'abort-to-prompt' instead of a normal return from the 'build' method. ("package->bag, sensitivity to %current-target-system"): Change 'build' to match the new build system signature. squash! build-system: Rewrite using gexps. squash! build-system: Rewrite using gexps.
151 lines
7.8 KiB
EmacsLisp
151 lines
7.8 KiB
EmacsLisp
;; Per-directory local variables for GNU Emacs 23 and later.
|
|
|
|
((nil
|
|
. ((fill-column . 78)
|
|
(tab-width . 8)
|
|
(sentence-end-double-space . t)
|
|
|
|
;; For use with 'bug-reference-prog-mode'.
|
|
(bug-reference-url-format . "http://bugs.gnu.org/%s")
|
|
(bug-reference-bug-regexp
|
|
. "<https?://\\(debbugs\\|bugs\\)\\.gnu\\.org/\\([0-9]+\\)>")
|
|
|
|
;; Emacs-Guix
|
|
(eval . (setq-local guix-directory
|
|
(locate-dominating-file default-directory
|
|
".dir-locals.el")))
|
|
|
|
;; Geiser
|
|
;; This allows automatically setting the `geiser-guile-load-path'
|
|
;; variable when using various Guix checkouts (e.g., via git worktrees).
|
|
(eval . (let ((root-dir-unexpanded (locate-dominating-file
|
|
default-directory ".dir-locals.el")))
|
|
;; While Guix should in theory always have a .dir-locals.el
|
|
;; (we are reading this file, after all) there seems to be a
|
|
;; strange problem where this code "escapes" to some other buffers,
|
|
;; at least vc-mode. See:
|
|
;; https://lists.gnu.org/archive/html/guix-devel/2020-11/msg00296.html
|
|
;; Upstream report: <https://bugs.gnu.org/44698>
|
|
;; Hence the following "when", which might otherwise be unnecessary;
|
|
;; it prevents causing an error when root-dir-unexpanded is nil.
|
|
(when root-dir-unexpanded
|
|
(let* ((root-dir (expand-file-name root-dir-unexpanded))
|
|
;; Workaround for bug https://issues.guix.gnu.org/43818.
|
|
(root-dir* (directory-file-name root-dir)))
|
|
|
|
(unless (boundp 'geiser-guile-load-path)
|
|
(defvar geiser-guile-load-path '()))
|
|
(make-local-variable 'geiser-guile-load-path)
|
|
(require 'cl-lib)
|
|
(cl-pushnew root-dir* geiser-guile-load-path
|
|
:test #'string-equal)))))))
|
|
|
|
(c-mode . ((c-file-style . "gnu")))
|
|
(scheme-mode
|
|
.
|
|
((indent-tabs-mode . nil)
|
|
(eval . (put 'eval-when 'scheme-indent-function 1))
|
|
(eval . (put 'call-with-prompt 'scheme-indent-function 1))
|
|
(eval . (put 'test-assert 'scheme-indent-function 1))
|
|
(eval . (put 'test-assertm 'scheme-indent-function 1))
|
|
(eval . (put 'test-equalm 'scheme-indent-function 1))
|
|
(eval . (put 'test-equal 'scheme-indent-function 1))
|
|
(eval . (put 'test-eq 'scheme-indent-function 1))
|
|
(eval . (put 'call-with-input-string 'scheme-indent-function 1))
|
|
(eval . (put 'guard 'scheme-indent-function 1))
|
|
(eval . (put 'lambda* 'scheme-indent-function 1))
|
|
(eval . (put 'substitute* 'scheme-indent-function 1))
|
|
(eval . (put 'match-record 'scheme-indent-function 2))
|
|
|
|
;; 'modify-phases' and its keywords.
|
|
(eval . (put 'modify-phases 'scheme-indent-function 1))
|
|
(eval . (put 'replace 'scheme-indent-function 1))
|
|
(eval . (put 'add-before 'scheme-indent-function 2))
|
|
(eval . (put 'add-after 'scheme-indent-function 2))
|
|
|
|
(eval . (put 'modify-services 'scheme-indent-function 1))
|
|
(eval . (put 'with-directory-excursion 'scheme-indent-function 1))
|
|
(eval . (put 'with-file-lock 'scheme-indent-function 1))
|
|
(eval . (put 'with-file-lock/no-wait 'scheme-indent-function 1))
|
|
(eval . (put 'with-profile-lock 'scheme-indent-function 1))
|
|
(eval . (put 'with-writable-file 'scheme-indent-function 2))
|
|
|
|
(eval . (put 'package 'scheme-indent-function 0))
|
|
(eval . (put 'package/inherit 'scheme-indent-function 1))
|
|
(eval . (put 'origin 'scheme-indent-function 0))
|
|
(eval . (put 'build-system 'scheme-indent-function 0))
|
|
(eval . (put 'bag 'scheme-indent-function 0))
|
|
(eval . (put 'graft 'scheme-indent-function 0))
|
|
(eval . (put 'operating-system 'scheme-indent-function 0))
|
|
(eval . (put 'file-system 'scheme-indent-function 0))
|
|
(eval . (put 'manifest-entry 'scheme-indent-function 0))
|
|
(eval . (put 'manifest-pattern 'scheme-indent-function 0))
|
|
(eval . (put 'substitute-keyword-arguments 'scheme-indent-function 1))
|
|
(eval . (put 'with-store 'scheme-indent-function 1))
|
|
(eval . (put 'with-external-store 'scheme-indent-function 1))
|
|
(eval . (put 'with-error-handling 'scheme-indent-function 0))
|
|
(eval . (put 'with-mutex 'scheme-indent-function 1))
|
|
(eval . (put 'with-atomic-file-output 'scheme-indent-function 1))
|
|
(eval . (put 'call-with-compressed-output-port 'scheme-indent-function 2))
|
|
(eval . (put 'call-with-decompressed-port 'scheme-indent-function 2))
|
|
(eval . (put 'call-with-gzip-input-port 'scheme-indent-function 1))
|
|
(eval . (put 'call-with-gzip-output-port 'scheme-indent-function 1))
|
|
(eval . (put 'call-with-lzip-input-port 'scheme-indent-function 1))
|
|
(eval . (put 'call-with-lzip-output-port 'scheme-indent-function 1))
|
|
(eval . (put 'signature-case 'scheme-indent-function 1))
|
|
(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))
|
|
(eval . (put 'with-derivation-narinfo 'scheme-indent-function 1))
|
|
(eval . (put 'with-derivation-substitute 'scheme-indent-function 2))
|
|
(eval . (put 'with-status-report 'scheme-indent-function 1))
|
|
(eval . (put 'with-status-verbosity 'scheme-indent-function 1))
|
|
(eval . (put 'with-build-handler 'scheme-indent-function 1))
|
|
|
|
(eval . (put 'mlambda 'scheme-indent-function 1))
|
|
(eval . (put 'mlambdaq 'scheme-indent-function 1))
|
|
(eval . (put 'syntax-parameterize 'scheme-indent-function 1))
|
|
(eval . (put 'with-monad 'scheme-indent-function 1))
|
|
(eval . (put 'mbegin 'scheme-indent-function 1))
|
|
(eval . (put 'mwhen 'scheme-indent-function 1))
|
|
(eval . (put 'munless 'scheme-indent-function 1))
|
|
(eval . (put 'mlet* 'scheme-indent-function 2))
|
|
(eval . (put 'mlet 'scheme-indent-function 2))
|
|
(eval . (put 'run-with-store 'scheme-indent-function 1))
|
|
(eval . (put 'run-with-state 'scheme-indent-function 1))
|
|
(eval . (put 'wrap-program 'scheme-indent-function 1))
|
|
(eval . (put 'with-imported-modules 'scheme-indent-function 1))
|
|
(eval . (put 'with-extensions 'scheme-indent-function 1))
|
|
(eval . (put 'with-parameters 'scheme-indent-function 1))
|
|
(eval . (put 'let-system 'scheme-indent-function 1))
|
|
(eval . (put 'with-build-variables 'scheme-indent-function 2))
|
|
|
|
(eval . (put 'with-database 'scheme-indent-function 2))
|
|
(eval . (put 'call-with-database 'scheme-indent-function 1))
|
|
(eval . (put 'call-with-transaction 'scheme-indent-function 1))
|
|
(eval . (put 'with-statement 'scheme-indent-function 3))
|
|
(eval . (put 'call-with-retrying-transaction 'scheme-indent-function 1))
|
|
(eval . (put 'call-with-savepoint 'scheme-indent-function 1))
|
|
(eval . (put 'call-with-retrying-savepoint 'scheme-indent-function 1))
|
|
|
|
(eval . (put 'call-with-container 'scheme-indent-function 1))
|
|
(eval . (put 'container-excursion 'scheme-indent-function 1))
|
|
(eval . (put 'eventually 'scheme-indent-function 1))
|
|
|
|
(eval . (put 'call-with-progress-reporter 'scheme-indent-function 1))
|
|
(eval . (put 'with-repository 'scheme-indent-function 2))
|
|
(eval . (put 'with-temporary-git-repository 'scheme-indent-function 2))
|
|
(eval . (put 'with-environment-variables 'scheme-indent-function 1))
|
|
(eval . (put 'with-fresh-gnupg-setup 'scheme-indent-function 1))
|
|
|
|
(eval . (put 'with-paginated-output-port 'scheme-indent-function 1))
|
|
|
|
;; This notably allows '(' in Paredit to not insert a space when the
|
|
;; preceding symbol is one of these.
|
|
(eval . (modify-syntax-entry ?~ "'"))
|
|
(eval . (modify-syntax-entry ?$ "'"))
|
|
(eval . (modify-syntax-entry ?+ "'"))))
|
|
(emacs-lisp-mode . ((indent-tabs-mode . nil)))
|
|
(texinfo-mode . ((indent-tabs-mode . nil)
|
|
(fill-column . 72))))
|