From ec2e893a8d6f1389a4abf4230ba8aa1cbf4d14b8 Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Sat, 4 Mar 2023 19:16:38 +0100
Subject: Install alidistlint and fix its setup

Newer versions of alidistlint are Python 3.9-compatible.
---
 tw/home/emacs.scm                            | 1 +
 tw/home/files/emacs-packages/alidist-mode.el | 2 +-
 tw/home/lap.scm                              | 2 +-
 tw/packages/alice.scm                        | 5 +++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tw/home/emacs.scm b/tw/home/emacs.scm
index 1a605fa7..bebad6ef 100644
--- a/tw/home/emacs.scm
+++ b/tw/home/emacs.scm
@@ -35,6 +35,7 @@
   (list
    ;; Development & language servers
    gnu-make
+   python-yamllint
    shellcheck
    clang  ; for clangd
    python-lsp-server
diff --git a/tw/home/files/emacs-packages/alidist-mode.el b/tw/home/files/emacs-packages/alidist-mode.el
index 12cb40f2..b68e1993 100644
--- a/tw/home/files/emacs-packages/alidist-mode.el
+++ b/tw/home/files/emacs-packages/alidist-mode.el
@@ -26,7 +26,7 @@
   :group 'alidist-mode)
 
 (defvar alidist-mode--message-regexp
-  (rx bol "-:"                                    ; filename
+  (rx bol "<stdin>:"                              ; filename
       (group (+ digit)) ":"                       ; line
       (group (+ digit)) ": "                      ; column
       (group (or "note" "warning" "error")) ": "  ; type
diff --git a/tw/home/lap.scm b/tw/home/lap.scm
index 2e8a629f..755dba67 100644
--- a/tw/home/lap.scm
+++ b/tw/home/lap.scm
@@ -116,7 +116,7 @@
      steam   ; see also: steam-nvidia
 
      ;; Work
-     s3cmd python-alibuild  ; python-alidistlint
+     s3cmd python-alibuild python-alidistlint
      hashicorp-nomad-bin hashicorp-consul-bin hashicorp-vault-bin hashicorp-packer-bin
 
      ;; i3 and Xorg. i3 itself must be installed system-wide for gdm to pick it up.
diff --git a/tw/packages/alice.scm b/tw/packages/alice.scm
index 154e8ad7..9039d008 100644
--- a/tw/packages/alice.scm
+++ b/tw/packages/alice.scm
@@ -48,14 +48,15 @@
 (define-public python-alidistlint
   (package
     (name "python-alidistlint")
-    (version "1.3.0")
+    (version "1.3.4")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "alidistlint" version))
-              (sha256 (base32 "1y8wvyy3yn0zw542iy8cajm5k6kilkmr7ix1hl7vvlbsc9d30wcq"))))
+              (sha256 (base32 "168x6qfh2k4ivzq611ddb32ksd0914d70lcnz8qzx202l49xbf9x"))))
     (build-system pyproject-build-system)  ; we don't have setup.py, only pyproject.toml
     (arguments '(#:tests? #f))             ; there are no tests, and build fails if #t
     (propagated-inputs (list python-cerberus python-pyyaml))
+    (native-inputs (list python-setuptools-scm))
     (home-page "https://github.com/TimoWilken/alidistlint")
     (synopsis "A code linter for alidist packages")
     (description "This package provides a code linter for alidist packages.")
-- 
cgit v1.2.3