diff --git a/radix/packages/text-editors.scm b/radix/packages/text-editors.scm index a2ab100..61e5829 100644 --- a/radix/packages/text-editors.scm +++ b/radix/packages/text-editors.scm @@ -8,6 +8,7 @@ #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (radix packages crates-io) #:use-module ((guix licenses) #:prefix license:) @@ -120,55 +121,57 @@ (license (list license:unlicense license:expat)))) (define-public kak-tree-sitter - (package - (name "kak-tree-sitter") - (version "1.1.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.sr.ht/~hadronized/kak-tree-sitter") - (commit (string-append "kak-tree-sitter-v" version)))) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "081r0jdcbhh9vks0y83bgcvxsmp2r530z0prhdp6nb3w4i5ry5f0")))) - (build-system cargo-build-system) - (arguments - `(#:install-source? #f - #:imported-modules (,@%cargo-build-system-modules - (guix build cargo-build-system)) - #:modules ((guix build utils) - (guix build cargo-build-system) - (ice-9 match)) - #:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) - ("rust-clap" ,rust-clap-4) - ("rust-colored" ,rust-colored-2) - ("rust-ctrlc" ,rust-ctrlc-3) - ("rust-daemonize" ,rust-daemonize-0.5) - ("rust-dirs" ,rust-dirs-5) - ("rust-itertools" ,rust-itertools-0.12) - ("rust-libc" ,rust-libc-0.2) - ("rust-libloading" ,rust-libloading-0.8) - ("rust-log" ,rust-log-0.4) - ("rust-mio" ,rust-mio-0.8) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-simple-logger" ,rust-simple-logger-5) - ("rust-thiserror" ,rust-thiserror-1) - ("rust-toml" ,rust-toml-0.8) - ("rust-tree-sitter" ,rust-tree-sitter-0.20) - ("rust-tree-sitter-highlight" ,rust-tree-sitter-highlight-0.20) - ("rust-tree-sitter-rust" ,rust-tree-sitter-rust-0.20) - ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) - ("rust-uuid" ,rust-uuid-1)) - #:phases ,#~(modify-phases %standard-phases - (replace 'install - (lambda _ - (let* ((bin (string-append #$output "/bin"))) - (install-file "target/release/ktsctl" bin) - (install-file "target/release/kak-tree-sitter" bin))))))) - (home-page "https://git.sr.ht/~hadronized/kak-tree-sitter/") - (synopsis "Server between Kakoune and tree-sitter") - (description - "This package provides Server between Kakoune and tree-sitter.") - (license license:bsd-3))) + (let ((commit "4a717751ffe599d1d46f70f8a9ad0bd978ef324a") + (revision "0")) + (package + (name "kak-tree-sitter") + (version (git-version "1.1.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~hadronized/kak-tree-sitter") + (commit commit))) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "14qqlxg4qi59njayc6xmgw62s3mnrba9ndz05cprfyxdwvnnqf3q")))) + (build-system cargo-build-system) + (arguments + `(#:install-source? #f + #:imported-modules (,@%cargo-build-system-modules + (guix build cargo-build-system)) + #:modules ((guix build utils) + (guix build cargo-build-system) + (ice-9 match)) + #:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-clap" ,rust-clap-4) + ("rust-colored" ,rust-colored-2) + ("rust-ctrlc" ,rust-ctrlc-3) + ("rust-daemonize" ,rust-daemonize-0.5) + ("rust-dirs" ,rust-dirs-5) + ("rust-itertools" ,rust-itertools-0.12) + ("rust-libc" ,rust-libc-0.2) + ("rust-libloading" ,rust-libloading-0.8) + ("rust-log" ,rust-log-0.4) + ("rust-mio" ,rust-mio-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-simple-logger" ,rust-simple-logger-5) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-toml" ,rust-toml-0.8) + ("rust-tree-sitter" ,rust-tree-sitter-0.20) + ("rust-tree-sitter-highlight" ,rust-tree-sitter-highlight-0.20) + ("rust-tree-sitter-rust" ,rust-tree-sitter-rust-0.20) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-uuid" ,rust-uuid-1)) + #:phases ,#~(modify-phases %standard-phases + (replace 'install + (lambda _ + (let* ((bin (string-append #$output "/bin"))) + (install-file "target/release/ktsctl" bin) + (install-file "target/release/kak-tree-sitter" bin))))))) + (home-page "https://git.sr.ht/~hadronized/kak-tree-sitter/") + (synopsis "Server between Kakoune and tree-sitter") + (description + "This package provides Server between Kakoune and tree-sitter.") + (license license:bsd-3))))