aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorHilton Chain <hako@ultrarare.space>2023-10-19 23:44:36 +0800
committerAndrew Tropin <andrew@trop.in>2023-10-20 12:41:05 +0400
commite5f34b6777689c5a89328af1358acd36eac61a3e (patch)
treec3719dbbf1615da45c6eb0e03c42022f9d9d5c2e /gnu/packages
parent474d2f3f5490922e97330f5e650e16e1d687b104 (diff)
downloadguix-e5f34b6777689c5a89328af1358acd36eac61a3e.tar.gz
guix-e5f34b6777689c5a89328af1358acd36eac61a3e.zip
gnu: tree-sitter: Re-indent.
* gnu/packages/tree-sitter.scm (tree-sitter-javascript,tree-sitter-cpp) (tree-sitter-elixir,tree-sitter-go,tree-sitter-python): Re-indent. Signed-off-by: Andrew Tropin <andrew@trop.in>
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/tree-sitter.scm82
1 files changed, 41 insertions, 41 deletions
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 057d853dd3..41257d42f1 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -320,26 +320,26 @@ which will be used as a snippet in origin."
;; Commit required by tree-sitter-typescript 0.20.3.
(let ((commit "f772967f7b7bc7c28f845be2420a38472b16a8ee")
(revision "22"))
- (tree-sitter-grammar
- "javascript" "JavaScript(JSX)"
- "0vp7z57scpbcvyxpya06lnpz9f5kjdb66wjlkrp684xwjjgq1wxd"
- (git-version "0.20.0" revision commit)
- #:commit commit
- #:get-cleanup-snippet
- (lambda (grammar-directories)
- #~(begin
- (use-modules (guix build utils))
- (delete-file "tree-sitter-javascript.wasm")
- (delete-file "binding.gyp")
- (delete-file-recursively "bindings")
- (for-each
- (lambda (lang)
- (with-directory-excursion lang
- (delete-file "src/grammar.json")
- (delete-file "src/node-types.json")
- (delete-file "src/parser.c")
- (delete-file-recursively "src/tree_sitter")))
- '#$grammar-directories))))))
+ (tree-sitter-grammar
+ "javascript" "JavaScript(JSX)"
+ "0vp7z57scpbcvyxpya06lnpz9f5kjdb66wjlkrp684xwjjgq1wxd"
+ (git-version "0.20.0" revision commit)
+ #:commit commit
+ #:get-cleanup-snippet
+ (lambda (grammar-directories)
+ #~(begin
+ (use-modules (guix build utils))
+ (delete-file "tree-sitter-javascript.wasm")
+ (delete-file "binding.gyp")
+ (delete-file-recursively "bindings")
+ (for-each
+ (lambda (lang)
+ (with-directory-excursion lang
+ (delete-file "src/grammar.json")
+ (delete-file "src/node-types.json")
+ (delete-file "src/parser.c")
+ (delete-file-recursively "src/tree_sitter")))
+ '#$grammar-directories))))))
(define-public tree-sitter-typescript
(tree-sitter-grammar
@@ -373,11 +373,11 @@ which will be used as a snippet in origin."
"0.20.6"))
(define-public tree-sitter-cpp
- (tree-sitter-grammar
- "cpp" "C++"
- "0fsb6la0da3azh7m9p1w3w079bpg6074dy8jisjw1yq1w1r9grxy"
- "0.20.3"
- #:inputs (list tree-sitter-c)))
+ (tree-sitter-grammar
+ "cpp" "C++"
+ "0fsb6la0da3azh7m9p1w3w079bpg6074dy8jisjw1yq1w1r9grxy"
+ "0.20.3"
+ #:inputs (list tree-sitter-c)))
(define-public tree-sitter-cmake
(tree-sitter-grammar
@@ -390,14 +390,14 @@ which will be used as a snippet in origin."
;; No tags at all, version in the source code is 0.19.0
(let ((commit "b20eaa75565243c50be5e35e253d8beb58f45d56")
(revision "0"))
- (tree-sitter-grammar
- "elixir" "Elixir"
- "1i0c0xki3sv24649p0ws7xs2jagbwg7z7baz1960239bj94nl487"
- (git-version "0.19.0" revision commit)
- #:article "an"
- #:repository-url "https://github.com/elixir-lang/tree-sitter-elixir"
- #:commit commit
- #:license (list license:asl2.0 license:expat))))
+ (tree-sitter-grammar
+ "elixir" "Elixir"
+ "1i0c0xki3sv24649p0ws7xs2jagbwg7z7baz1960239bj94nl487"
+ (git-version "0.19.0" revision commit)
+ #:article "an"
+ #:repository-url "https://github.com/elixir-lang/tree-sitter-elixir"
+ #:commit commit
+ #:license (list license:asl2.0 license:expat))))
(define-public tree-sitter-heex
(tree-sitter-grammar
@@ -441,10 +441,10 @@ which will be used as a snippet in origin."
#:repository-url "https://github.com/camdencheek/tree-sitter-go-mod.git"))
(define-public tree-sitter-go
- (tree-sitter-grammar
- "go" "Go"
- "0wlhwcdlaj74japyn8wjza0fbwckqwbqv8iyyqdk0a5jf047rdqv"
- "0.20.0"))
+ (tree-sitter-grammar
+ "go" "Go"
+ "0wlhwcdlaj74japyn8wjza0fbwckqwbqv8iyyqdk0a5jf047rdqv"
+ "0.20.0"))
(define-public tree-sitter-haskell
;; There are a lot of additions, the last tag was placed more than 4 years ago
@@ -495,10 +495,10 @@ which will be used as a snippet in origin."
#:commit commit)))
(define-public tree-sitter-python
- (tree-sitter-grammar
- "python" "Python"
- "1sxz3npk3mq86abcnghfjs38nzahx7nrn3wdh8f8940hy71d0pvi"
- "0.20.4"))
+ (tree-sitter-grammar
+ "python" "Python"
+ "1sxz3npk3mq86abcnghfjs38nzahx7nrn3wdh8f8940hy71d0pvi"
+ "0.20.4"))
(define-public tree-sitter-r
;; No tags
caa5b04aae77e5d2e3a2299305a43'>gnu: build: Add Linux container module....* gnu/build/linux-container.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. * .dir-locals.el: Add Scheme indent rules for 'call-with-container', and 'container-excursion'. * tests/containers.scm: New file. * Makefile.am (SCM_TESTS): Add it. David Thompson 2015-06-06store: Add 'verify-store' RPC....* guix/store.scm (operation-id): Add 'verify-store'. (verify-store): New procedure. (set-build-options): Adjust comment. * tests/store.scm ("verify-store", "verify-store + check-contents"): New tests. Ludovic Courtès 2015-05-25ui: Auto-compile user code, and improve error reporting....Reported by Christian Grothoff. * guix/ui.scm (load*): Add 'frame-with-source'. Set %load-should-auto-compile. Change error handle to just (exit 1). Add pre-unwind handler to capture the stack and call 'report-load-error'. (report-load-error): Add optional 'frame' parameter and pass it to 'display-error'. * tests/guix-system.sh: Add "unbound variable" test. Ludovic Courtès 2015-05-06profiles: Generate an 'etc/profile' file....Suggested by 宋文武 <iyzsong@gmail.com> in <http://bugs.gnu.org/20255>. * guix/build/profiles.scm (abstract-profile, write-environment-variable-definition): New procedures. (build-profile): Add #:search-paths parameter. Create OUTPUT/etc/profile. * guix/profiles.scm (profile-derivation)[builder]: Add 'search-paths' variable and pass it to 'build-profile'. Adjust #:modules argument. * tests/profiles.scm ("etc/profile"): New test. * doc/guix.texi (Invoking guix package): Mention etc/profile. Ludovic Courtès 2015-02-26utils: Add 'modify-phases'....* guix/build/utils.scm (modify-phases): New macro. Ludovic Courtès 2015-02-02Set Emacs indentation for `wrap-program'....* .dir-locals.el (scheme-mode): Set `scheme-indent-function' of `wrap-program' to 1. Taylan Ulrich B 2015-02-02tests: Add 'with-derivation-substitute' and use it....* guix/tests.scm (%substitute-directory): New variable. (call-with-derivation-narinfo): Use it. (call-with-derivation-substitute): New procedure. (with-derivation-substitute): New macro. * tests/store.scm ("substitute"): Use 'with-derivation-substitute'. ("substitute, corrupt output hash"): Likewise. Ludovic Courtès 2015-02-02tests: Further factorize substitute mocks....* guix/tests.scm (derivation-narinfo): Turn 'nar' into a keyword parameter. Add #:sha256 parameter, and honor it. (call-with-derivation-narinfo): Add #:sha256 and pass it to 'derivation-narinfo'. (with-derivation-narinfo): Extend with support for (sha256 => value). * tests/store.scm ("substitute query"): Use 'with-derivation-narinfo'. ("substitute"): Likewise. ("substitute, corrupt output hash"): Likewise. ("substitute --fallback"): Likewise. * tests/derivations.scm: Remove Emacs local variable. Ludovic Courtès 2015-01-17monads: Add the state monad....* guix/monads.scm (state-return, state-bind, run-with-state, current-state, set-current-state, state-push, state-pop): New procedures. (%state-monad): New variable. * tests/monads.scm (%monads): Add %STATE-MONAD. (%monad-run): Add 'run-with-state'. (values->list): New macro. ("set-current-state", "state-push etc."): New tests. Ludovic Courtès 2014-12-02monads: Add 'mwhen' and 'munless'....* guix/monads.scm (mbegin): Add special '%current-monad' syntactic keyword. (mwhen, munless): New macros. Ludovic Courtès 2014-10-17derivations: Introduce 'graft' record type....* guix/derivations.scm (<graft>): New record type. (graft-derivation): Rename 'replacements' to 'grafts', and expect it to be a list of <graft> records. Adjust accordingly. * tests/derivations.scm ("graft-derivation"): Use 'graft' instead of pairs in argument to 'graft-derivation'. Ludovic Courtès 2014-10-12Augment '.dir-locals.el' with bug-reference-mode settings.Ludovic Courtès 2014-10-08monads: Add 'mbegin'....* guix/monads.scm (mbegin): New macro. * tests/monads.scm ("mbegin"): New test. * doc/guix.texi (The Store Monad): Document it. Ludovic Courtès 2014-10-05build-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. Ludovic Courtès 2014-08-18gexp: 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. Ludovic Courtès 2014-08-14Add (guix build emacs-utils)....* guix/build/emacs-utils.scm: New file. * Makefile.am (MODULES): Add it. * .dir-locals.el: Add indentation rules. Mark H Weaver 2014-05-03system: Add first-class file system declarations....* gnu/system.scm (<operating-system>)[initrd]: Default to 'qemu-initrd'. (<file-system>): New record type. (operating-system-root-file-system): New procedure. (operating-system-derivation): Take the device name for GRUB from 'operating-system-root-file-system'. Pass the 'operating-system-initrd' procedure the list of boot file systems. * gnu/system/linux-initrd.scm (file-system->spec): New procedure. (qemu-initrd): Add 'file-systems' parameter, and remove #:mounts parameter. [file-system-type-predicate]: New procedure. [linux-modules]: Use it. Adjust #:mounts argument in 'boot-system' call. (gnu-system-initrd): Remove. * gnu/system/vm.scm (%linux-vm-file-systems): New variable. (expression->derivation-in-linux-vm): Adjust call to 'qemu-initrd'. (virtualized-operating-system): New procedure. (system-qemu-image/shared-store-script)[initrd]: Remove. Use 'virtualized-operating-system'. Get the 'initrd' file from OS-DRV. * guix/build/linux-initrd.scm (mount-qemu-smb-share, mount-qemu-9p): Remove. (MS_RDONLY, MS_BIND): New global variables. (bind-mount): Remove local 'MS_BIND' definition. (mount-root-file-system): New procedure, with code formerly in 'boot-system'. (mount-file-system): New procedure. (boot-system): Add #:root-fs-type parameter. Remove 'MS_RDONLY' local variable. Use 'mount-root-file-system' and 'mount-file-system'. * doc/guix.texi (Using the Configuration System): Add 'file-system' declaration. Ludovic Courtès 2014-04-28Add (guix gexp)....* guix/gexp.scm: New file. * tests/gexp.scm: New file. * Makefile.am (MODULES): Add guix/gexp.scm. (SCM_TESTS): Add tests/gexp.scm. * doc/guix.texi (Derivations): Add #:inputs in 'derivation' example. Mark 'build-expression->derivation' as deprecated, refer to "G-Expressions". Remove paragraph about code strata. (G-Expressions): New node. Ludovic Courtès 2014-03-31pki: Add 'signature-case' macro....* guix/pki.scm (%signature-status): New procedure. (signature-case): New macro. * tests/pki.scm (%secret-key, %alternate-secret-key): New variables. ("signature-case valid-signature", "signature-case invalid-signature", "signature-case hash-mismatch", "signature-case unauthorized-key", "signature-case corrupt-signature"): New tests. Ludovic Courtès 2014-03-24utils: Add 'call-with-decompressed-port' and 'call-with-compressed-output-port'....* guix/utils.scm (call-with-decompressed-port, call-with-compressed-output-port): New procedures. * tests/utils.scm ("compressed-output-port + decompressed-port"): Rewrite to use them. Ludovic Courtès 2014-01-24store: Add 'with-store' convenience macro....* guix/store.scm (with-store): New macro. Ludovic Courtès 2013-12-29Move 'with-atomic-file-output' to (guix utils)....* guix/scripts/substitute-binary.scm (with-atomic-file-output): Move to... * guix/utils.scm (with-atomic-file-output): ... here. Ludovic Courtès 2013-11-07Add indentation rule for 'origin'.Ludovic Courtès 2013-11-01guix package: Allow removal of a specific package output....Fixes <http://bugs.gnu.org/15756>. * guix/profiles.scm (<manifest-pattern>): New record type. (remove-manifest-entry): Remove. (entry-predicate, manifest-matching-entries): New procedures. (manifest-remove): Accept a list of <manifest-pattern>. (manifest-installed?): Replace 'name' parameter by 'pattern', a <manifest-pattern>. * guix/scripts/package.scm (options->removable): Return a list of <manifest-pattern>. (guix-package)[process-action]: Use 'manifest-matching-entries' to compute the list of packages to remove. * tests/profiles.scm: New file. * Makefile.am (SCM_TESTS): Add it. Ludovic Courtès 2013-10-29Change indentation rule for 'package' for the common case....* .dir-locals.el: Change the indentation rule for 'package' to do the right thing for packages without an inherit clause. Mark H Weaver 2013-10-03Add (guix monads)....* guix/monads.scm: New file. * tests/monads.scm: New file. * Makefile.am (MODULES): Add guix/monads.scm. (SCM_TESTS): Add tests/monads.scm. * doc/guix.texi (The Store Monad): New node. (The Store): Reference it. Ludovic Courtès 2013-05-14substitute-binary: Work around thread-unsafe `regexp-exec'....* guix/scripts/substitute-binary.scm (%regexp-exec-mutex): New variable. (string->uri): New procedure. (fields->alist): Wrap `regexp-exec' call in `with-mutex'. Ludovic Courtès 2013-02-01Augment `.dir-locals.el'....* .dir-locals.el: Add more Scheme settings. * guix-build.in, tests/base32.scm, tests/build-utils.scm, tests/builders.scm, tests/derivations.scm, tests/packages.scm, tests/snix.scm, tests/store.scm, tests/union.scm, tests/utils.scm: Remove redundant Emacs local variable settings. Ludovic Courtès 2013-01-30.dir-locals.el: Fill at 78 columns.Ludovic Courtès