about summary refs log tree commit diff
path: root/maintainers/scripts
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2024-05-11 12:47:40 +0200
committerJan Tojnar <jtojnar@gmail.com>2024-05-11 12:47:40 +0200
commit4be4408157159e40a946af47bb2f646efbbc5519 (patch)
tree4ad14315153832c4ff287a8239b876e02b08b75e /maintainers/scripts
parent9a226faa3885169ccb8d9677d57aa27b000786c7 (diff)
parent435233f4d1f4f592716f661d9c5657b40e78bfc1 (diff)
Merge branch 'master' into staging-next
; Conflicts:
;	maintainers/scripts/luarocks-packages.csv
;	pkgs/development/lua-modules/generated-packages.nix
Diffstat (limited to 'maintainers/scripts')
-rwxr-xr-xmaintainers/scripts/kde/collect-missing-deps.py4
-rw-r--r--maintainers/scripts/luarocks-packages.csv2
2 files changed, 6 insertions, 0 deletions
diff --git a/maintainers/scripts/kde/collect-missing-deps.py b/maintainers/scripts/kde/collect-missing-deps.py
index f3943338b57fb..9625da71c3e51 100755
--- a/maintainers/scripts/kde/collect-missing-deps.py
+++ b/maintainers/scripts/kde/collect-missing-deps.py
@@ -28,6 +28,7 @@ OK_MISSING_BY_PACKAGE = {
     "discover": {
         "rpm-ostree-1",  # we don't have rpm-ostree (duh)
         "Snapd",  # we don't have snaps and probably never will
+        "packagekitqt6",  # intentionally disabled
     },
     "elisa": {
         "UPNPQT",  # upstream says it's broken
@@ -36,6 +37,9 @@ OK_MISSING_BY_PACKAGE = {
         "Sphinx",  # only used for docs, bloats closure size
         "QCollectionGenerator"
     },
+    "gwenview": {
+        "Tiff",  # duplicate?
+    },
     "kio-extras-kf5": {
         "KDSoapWSDiscoveryClient",  # actually vendored on KF5 version
     },
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 4ff310371fe88..08cc75b346eee 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -78,6 +78,7 @@ luaossl,,,,,5.1,
 luaposix,,,,34.1.1-1,,vyp lblasc
 luarepl,,,,,,
 luarocks-build-rust-mlua,,,,,,mrcjkb
+luarocks-build-treesitter-parser,,,,,,mrcjkb
 luasec,,,,,,flosse
 luasnip,,,,,,
 luasocket,,,,,,
@@ -131,6 +132,7 @@ tiktoken_core,,,,,,natsukium
 tl,,,,,,mephistophiles
 toml,,,,,,mrcjkb
 toml-edit,,,,,5.1,mrcjkb
+tree-sitter-norg,,,,,5.1,mrcjkb
 vstruct,,,,,,
 vusted,,,,,,figsoda
 xml2lua,,,,,,teto