Arch Linux User Repository

Please ignore my previous comment, I did a silly.

can you remove --locked from the fetch? I am getting:

    Updating crates.io index
    Updating git repository `https://github.com/waycrate/sweet.git`
error: the lock file /home/david/.cache/paru/clone/swhkd-git/src/swhkd/Cargo.lock needs to be updated but --locked was passed to prevent this
If you want to try to generate the lock file without accessing the network, remove the --locked flag and use --offline instead.
==> ERROR: A failure occurred in prepare().
    Aborting...
error: failed to build 'swhkd-git-1.2.1.r70.g3db287e-1':
error: packages failed to build: swhkd-git-1.2.1.r70.g3db287e-1

Please add provides=("swhkd=${pkgver}"), and add swhkd to the conflicts array.

Thanks for maintaining!

conflicts should be changed to conflicts=('swhkd'), and this package should provide the same. Also, make should not be part of the makedepends

might be nice to add the vim-plugin to the package:

diff --git a/PKGBUILD b/PKGBUILD
index 7560665..c1654ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@

 _pkgname="swhkd"
 pkgname="${_pkgname}-git"
-pkgver=.552.g1b6cf27
-pkgrel=2
+pkgver=1.2.1.r17.g022466e
+pkgrel=1
 arch=("x86_64")
 url="https://github.com/waycrate/swhkd"
 pkgdesc="A display server independent hotkey daemon inspired by sxhkd."
@@ -13,8 +13,10 @@ license=("BSD")
 depends=("polkit")
 makedepends=("rustup" "make" "git" "scdoc")
 conflicts=("swhkd-musl-git")
-source=("${_pkgname}::git+${url}.git")
-sha256sums=("SKIP")
+source=("${_pkgname}::git+${url}.git"
+        "${_pkgname}-vim::git+${url}-vim.git")
+sha256sums=("SKIP"
+            "SKIP")

 build(){
    cd "$_pkgname"
@@ -31,9 +33,15 @@ package() {

    install -Dm 644 ./docs/*.1.gz -t "$pkgdir/usr/share/man/man1/"
    install -Dm 644 ./docs/*.5.gz -t "$pkgdir/usr/share/man/man5/"
+
+   cd "${srcdir}/${_pkgname}-vim"
+   for i in ftdetect ftplugin indent syntax; do
+       install -Dm644 "$i/${_pkgname}.vim" \
+           "${pkgdir}/usr/share/vim/vimfiles/$i/${_pkgname}.vim"
+   done
 }

 pkgver() {
    cd $_pkgname
-   echo "$(grep "^version =" Cargo.toml|head -n1|cut -d\" -f2|cut -d\- -f1).$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
+   git describe --long --tags --match'=[0-9]*' | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }

(also fixed the pkgver func)

@skerit No, it's a -git package so regardless of the version tagged in the PKGBUILD, you're on the latest commit.

The current installed version is actually 1.2.0.517.g04e5125, even though this still says 1.1.7.480.ge4a1a89. Do you have to manually update the version each time there is a commit? :o