[arch-commits] Commit in helix/trunk (PKGBUILD helix.sh)

Orhun Parmaksiz orhun at gemini.archlinux.org
Tue Apr 5 20:34:15 UTC 2022


    Date: Tuesday, April 5, 2022 @ 20:34:14
  Author: orhun
Revision: 1181499

upgpkg: helix 22.03-1: upstream release

Modified:
  helix/trunk/PKGBUILD
  helix/trunk/helix.sh

----------+
 PKGBUILD |  175 ++++++-------------------------------------------------------
 helix.sh |    2 
 2 files changed, 19 insertions(+), 158 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-05 20:31:47 UTC (rev 1181498)
+++ PKGBUILD	2022-04-05 20:34:14 UTC (rev 1181499)
@@ -2,8 +2,7 @@
 # Contributor: Wojciech Kępka (wojciech at wkepka.dev)
 
 pkgname=helix
-pkgver=0.6.0
-_gitcommit=ac1b7d8d0a608f47edfee2872d414e94fd26cc31
+pkgver=22.03
 pkgrel=1
 pkgdesc="A post-modern modal text editor"
 arch=('x86_64')
@@ -12,179 +11,41 @@
 depends=('bash')
 makedepends=('cargo' 'git')
 install="$pkgname.install"
-source=("${pkgname}::git+https://github.com/helix-editor/helix.git#commit=${_gitcommit}"
-  "${pkgname}-tree-sitter-cpp::git+https://github.com/tree-sitter/tree-sitter-cpp"
-  "${pkgname}-tree-sitter-julia::git+https://github.com/tree-sitter/tree-sitter-julia"
-  "${pkgname}-tree-sitter-agda::git+https://github.com/tree-sitter/tree-sitter-agda"
-  "${pkgname}-tree-sitter-python::git+https://github.com/tree-sitter/tree-sitter-python"
-  "${pkgname}-tree-sitter-javascript::git+https://github.com/tree-sitter/tree-sitter-javascript"
-  "${pkgname}-tree-sitter-go::git+https://github.com/tree-sitter/tree-sitter-go"
-  "${pkgname}-tree-sitter-java::git+https://github.com/tree-sitter/tree-sitter-java"
-  "${pkgname}-tree-sitter-scala::git+https://github.com/tree-sitter/tree-sitter-scala"
-  "${pkgname}-tree-sitter-ruby::git+https://github.com/tree-sitter/tree-sitter-ruby"
-  "${pkgname}-tree-sitter-rust::git+https://github.com/tree-sitter/tree-sitter-rust"
-  "${pkgname}-tree-sitter-php::git+https://github.com/tree-sitter/tree-sitter-php"
-  "${pkgname}-tree-sitter-html::git+https://github.com/tree-sitter/tree-sitter-html"
-  "${pkgname}-tree-sitter-elixir::git+https://github.com/elixir-lang/tree-sitter-elixir"
-  "${pkgname}-tree-sitter-c::git+https://github.com/tree-sitter/tree-sitter-c"
-  "${pkgname}-tree-sitter-json::git+https://github.com/tree-sitter/tree-sitter-json"
-  "${pkgname}-tree-sitter-bash::git+https://github.com/tree-sitter/tree-sitter-bash"
-  "${pkgname}-tree-sitter-ledger::git+https://github.com/cbarrete/tree-sitter-ledger"
-  "${pkgname}-tree-sitter-nix::git+https://github.com/cstrahan/tree-sitter-nix"
-  "${pkgname}-tree-sitter-toml::git+https://github.com/ikatyang/tree-sitter-toml"
-  "${pkgname}-tree-sitter-css::git+https://github.com/tree-sitter/tree-sitter-css"
-  "${pkgname}-tree-sitter-latex::git+https://github.com/latex-lsp/tree-sitter-latex"
-  "${pkgname}-tree-sitter-c-sharp::git+https://github.com/tree-sitter/tree-sitter-c-sharp"
-  "${pkgname}-tree-sitter-swift::git+https://github.com/tree-sitter/tree-sitter-swift"
-  "${pkgname}-tree-sitter-protobuf::git+https://github.com/yusdacra/tree-sitter-protobuf.git"
-  "${pkgname}-tree-sitter-lua::git+https://github.com/nvim-treesitter/tree-sitter-lua"
-  "${pkgname}-tree-sitter-haskell::git+https://github.com/tree-sitter/tree-sitter-haskell"
-  "${pkgname}-tree-sitter-ocaml::git+https://github.com/tree-sitter/tree-sitter-ocaml"
-  "${pkgname}-tree-sitter-svelte::git+https://github.com/Himujjal/tree-sitter-svelte"
-  "${pkgname}-tree-sitter-tsq::git+https://github.com/tree-sitter/tree-sitter-tsq"
-  "${pkgname}-tree-sitter-yaml::git+https://github.com/ikatyang/tree-sitter-yaml"
-  "${pkgname}-tree-sitter-cmake::git+https://github.com/uyha/tree-sitter-cmake"
-  "${pkgname}-tree-sitter-perl::git+https://github.com/ganezdragon/tree-sitter-perl"
-  "${pkgname}-tree-sitter-zig::git+https://github.com/maxxnino/tree-sitter-zig"
-  "${pkgname}-tree-sitter-comment::git+https://github.com/stsewd/tree-sitter-comment"
-  "${pkgname}-tree-sitter-llvm::git+https://github.com/benwilliamgraham/tree-sitter-llvm"
-  "${pkgname}-tree-sitter-typescript::git+https://github.com/tree-sitter/tree-sitter-typescript"
-  "${pkgname}-tree-sitter-glsl::git+https://github.com/theHamsta/tree-sitter-glsl.git"
-  "${pkgname}-tree-sitter-dart::git+https://github.com/UserNobody14/tree-sitter-dart.git"
-  "${pkgname}-tree-sitter-wgsl::git+https://github.com/szebniok/tree-sitter-wgsl"
-  "${pkgname}-tree-sitter-fish::git+https://github.com/ram02z/tree-sitter-fish"
-  "${pkgname}-tree-sitter-markdown::git+https://github.com/MDeiml/tree-sitter-markdown"
-  "${pkgname}-tree-sitter-dockerfile::git+https://github.com/camdencheek/tree-sitter-dockerfile.git"
-  "${pkgname}-tree-sitter-git-diff::git+https://github.com/the-mikedavis/tree-sitter-git-diff.git"
-  "${pkgname}-tree-sitter-git-rebase::git+https://github.com/the-mikedavis/tree-sitter-git-rebase.git"
-  "${pkgname}-tree-sitter-tablegen::git+https://github.com/Flakebi/tree-sitter-tablegen"
-  "${pkgname}-tree-sitter-vue::git+https://github.com/ikatyang/tree-sitter-vue"
-  "${pkgname}-tree-sitter-git-commit::git+https://github.com/the-mikedavis/tree-sitter-git-commit.git"
-  "$pkgname.sh"
-)
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'f782c93bc0f2c7b27ec62fb2ba36e11b3354c3953405f8d2017b039c9eac500a')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/helix-editor/helix/archive/$pkgver.tar.gz"
+        "$pkgname.sh")
+sha256sums=('a21f4d7b6390930a89b59567909ad7c613a1eeeafc813167ff7bc3be603997f4'
+            '90d14e5c8fb65e64b508fcf4358cb45191b39e24bd6c5981814139a2a627fa5c')
 options=('!lto')
 
 prepare() {
-  cd "$pkgname"
-
-  git config submodule."helix-syntax/languages/tree-sitter-cpp".url "${srcdir}/${pkgname}"-tree-sitter-cpp
-  git config submodule."helix-syntax/languages/tree-sitter-javascript".url "${srcdir}/${pkgname}"-tree-sitter-javascript
-  git config submodule."helix-syntax/languages/tree-sitter-julia".url "${srcdir}/${pkgname}"-tree-sitter-julia
-  git config submodule."helix-syntax/languages/tree-sitter-python".url "${srcdir}/${pkgname}"-tree-sitter-python
-  git config submodule."helix-syntax/languages/tree-sitter-typescript".url "${srcdir}/${pkgname}"-tree-sitter-typescript
-  git config submodule."helix-syntax/languages/tree-sitter-agda".url "${srcdir}/${pkgname}"-tree-sitter-agda
-  git config submodule."helix-syntax/languages/tree-sitter-go".url "${srcdir}/${pkgname}"-tree-sitter-go
-  git config submodule."helix-syntax/languages/tree-sitter-ruby".url "${srcdir}/${pkgname}"-tree-sitter-ruby
-  git config submodule."helix-syntax/languages/tree-sitter-java".url "${srcdir}/${pkgname}"-tree-sitter-java
-  git config submodule."helix-syntax/languages/tree-sitter-php".url "${srcdir}/${pkgname}"-tree-sitter-php
-  git config submodule."helix-syntax/languages/tree-sitter-html".url "${srcdir}/${pkgname}"-tree-sitter-html
-  git config submodule."helix-syntax/languages/tree-sitter-scala".url "${srcdir}/${pkgname}"-tree-sitter-scala
-  git config submodule."helix-syntax/languages/tree-sitter-bash".url "${srcdir}/${pkgname}"-tree-sitter-bash
-  git config submodule."helix-syntax/languages/tree-sitter-rust".url "${srcdir}/${pkgname}"-tree-sitter-rust
-  git config submodule."helix-syntax/languages/tree-sitter-json".url "${srcdir}/${pkgname}"-tree-sitter-json
-  git config submodule."helix-syntax/languages/tree-sitter-css".url "${srcdir}/${pkgname}"-tree-sitter-css
-  git config submodule."helix-syntax/languages/tree-sitter-c-sharp".url "${srcdir}/${pkgname}"-tree-sitter-c-sharp
-  git config submodule."helix-syntax/languages/tree-sitter-c".url "${srcdir}/${pkgname}"-tree-sitter-c
-  git config submodule."helix-syntax/languages/tree-sitter-haskell".url "${srcdir}/${pkgname}"-tree-sitter-haskell
-  git config submodule."helix-syntax/languages/tree-sitter-swift".url "${srcdir}/${pkgname}"-tree-sitter-swift
-  git config submodule."helix-syntax/languages/tree-sitter-toml".url "${srcdir}/${pkgname}"-tree-sitter-toml
-  git config submodule."helix-syntax/languages/tree-sitter-elixir".url "${srcdir}/${pkgname}"-tree-sitter-elixir
-  git config submodule."helix-syntax/languages/tree-sitter-nix".url "${srcdir}/${pkgname}"-tree-sitter-nix
-  git config submodule."helix-syntax/languages/tree-sitter-latex".url "${srcdir}/${pkgname}"-tree-sitter-latex
-  git config submodule."helix-syntax/languages/tree-sitter-ledger".url "${srcdir}/${pkgname}"-tree-sitter-ledger
-  git config submodule."helix-syntax/languages/tree-sitter-protobuf".url "${srcdir}/${pkgname}"-tree-sitter-protobuf
-  git config submodule."helix-syntax/languages/tree-sitter-ocaml".url "${srcdir}/${pkgname}"-tree-sitter-ocaml
-  git config submodule."helix-syntax/languages/tree-sitter-lua".url "${srcdir}/${pkgname}"-tree-sitter-lua
-  git config submodule."helix-syntax/languages/tree-sitter-yaml".url "${srcdir}/${pkgname}"-tree-sitter-yaml
-  git config submodule."helix-syntax/languages/tree-sitter-zig".url "${srcdir}/${pkgname}"-tree-sitter-zig
-  git config submodule."helix-syntax/languages/tree-sitter-svelte".url "${srcdir}/${pkgname}"-tree-sitter-svelte
-  git config submodule."helix-syntax/languages/tree-sitter-vue".url "${srcdir}/${pkgname}"-tree-sitter-vue
-  git config submodule."helix-syntax/languages/tree-sitter-tsq".url "${srcdir}/${pkgname}"-tree-sitter-tsq
-  git config submodule."helix-syntax/languages/tree-sitter-cmake".url "${srcdir}/${pkgname}"-tree-sitter-cmake
-  git config submodule."helix-syntax/languages/tree-sitter-glsl".url "${srcdir}/${pkgname}"-tree-sitter-glsl
-  git config submodule."helix-syntax/languages/tree-sitter-perl".url "${srcdir}/${pkgname}"-tree-sitter-perl
-  git config submodule."helix-syntax/languages/tree-sitter-comment".url "${srcdir}/${pkgname}"-tree-sitter-comment
-  git config submodule."helix-syntax/languages/tree-sitter-wgsl".url "${srcdir}/${pkgname}"-tree-sitter-wgsl
-  git config submodule."helix-syntax/languages/tree-sitter-llvm".url "${srcdir}/${pkgname}"-tree-sitter-llvm
-  git config submodule."helix-syntax/languages/tree-sitter-markdown".url "${srcdir}/${pkgname}"-tree-sitter-markdown
-  git config submodule."helix-syntax/languages/tree-sitter-dart".url "${srcdir}/${pkgname}"-tree-sitter-dart
-  git config submodule."helix-syntax/languages/tree-sitter-dockerfile".url "${srcdir}/${pkgname}"-tree-sitter-dockerfile
-  git config submodule."helix-syntax/languages/tree-sitter-fish".url "${srcdir}/${pkgname}"-tree-sitter-fish
-  git config submodule."helix-syntax/languages/tree-sitter-git-commit".url "${srcdir}/${pkgname}"-tree-sitter-git-commit
-  git config submodule."helix-syntax/languages/tree-sitter-git-diff".url "${srcdir}/${pkgname}"-tree-sitter-git-diff
-  git config submodule."helix-syntax/languages/tree-sitter-tablegen".url "${srcdir}/${pkgname}"-tree-sitter-tablegen
-  git config submodule."helix-syntax/languages/tree-sitter-git-rebase".url "${srcdir}/${pkgname}"-tree-sitter-git-rebase
-
-  git submodule update --init --recursive
+  cd "$pkgname-$pkgver"
   cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
-  cd "$pkgname"
+  cd "$pkgname-$pkgver"
   cargo build --frozen --release
 }
 
 check() {
-  cd "$pkgname"
+  cd "$pkgname-$pkgver"
   cargo test --frozen --all-features
 }
 
 package() {
-  cd "$pkgname"
+  cd "$pkgname-$pkgver"
   install -Dm 755 "../$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
   install -Dm 755 "target/release/hx" "$pkgdir/usr/lib/$pkgname/hx"
-  mkdir -p "$pkgdir/usr/lib/helix/"
-  cp -r "runtime" "$pkgdir/usr/lib/helix/"
   install -Dm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname"
+
+  local runtime_dir="$pkgdir/var/lib/$pkgname/runtime"
+  mkdir -p "$runtime_dir/grammars"
+  cp -r "runtime/queries" "$runtime_dir"
+  cp -r "runtime/themes" "$runtime_dir"
+  find "runtime/grammars" -type f -name '*.so' -exec \
+    install -Dm 755 {} -t "$runtime_dir/grammars" \;
+  install -Dm 644 runtime/tutor.txt -t "$runtime_dir"
+  ln -s "/var/lib/$pkgname/runtime" "$pkgdir/usr/lib/$pkgname/runtime"
 }
 
 # vim: ts=2 sw=2 et:

Modified: helix.sh
===================================================================
--- helix.sh	2022-04-05 20:31:47 UTC (rev 1181498)
+++ helix.sh	2022-04-05 20:34:14 UTC (rev 1181499)
@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-HELIX_RUNTIME=/usr/lib/helix/runtime exec /usr/lib/helix/hx "$@"
+HELIX_RUNTIME=/var/lib/helix/runtime exec /usr/lib/helix/hx "$@"



More information about the arch-commits mailing list