From e8f3c74367d91b6dc9677c62552e5e6a938968c6 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Tue, 7 May 2024 22:28:47 +0200 Subject: luaPackages.tree-sitter-norg: init at 0.2.4-1 --- maintainers/scripts/luarocks-packages.csv | 2 ++ 1 file changed, 2 insertions(+) (limited to 'maintainers/scripts') diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 4b41b78875124..75c4b687ecac2 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,https://github.com/ToxicFrog/vstruct.git,,,,, vusted,,,,,,figsoda xml2lua,,,,,,teto -- cgit 1.4.1 From 9e4acec7f2eb6e3c9524132d6ad585b26ef66ee8 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 10 May 2024 20:39:41 +0300 Subject: kdePackages: fix some disappeared dependencies CMake cross continues to be very scuffed. --- maintainers/scripts/kde/collect-missing-deps.py | 4 ++++ pkgs/kde/gear/akonadi-search/default.nix | 3 +-- pkgs/kde/gear/angelfish/default.nix | 3 +-- pkgs/kde/gear/ghostwriter/default.nix | 4 ++-- pkgs/kde/gear/kcalc/default.nix | 3 +-- pkgs/kde/gear/kdepim-addons/default.nix | 5 ++--- pkgs/kde/gear/kopeninghours/default.nix | 1 + 7 files changed, 12 insertions(+), 11 deletions(-) (limited to 'maintainers/scripts') 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/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix index 6e89f0b685ff7..416dd91a9ee5b 100644 --- a/pkgs/kde/gear/akonadi-search/default.nix +++ b/pkgs/kde/gear/akonadi-search/default.nix @@ -26,9 +26,8 @@ mkKdeDerivation rec { extraNativeBuildInputs = [ rustPlatform.cargoSetupHook cargo - corrosion rustc ]; - extraBuildInputs = [xapian]; + extraBuildInputs = [corrosion xapian]; } diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix index 2250b5db6a43b..0d9b4a341f05d 100644 --- a/pkgs/kde/gear/angelfish/default.nix +++ b/pkgs/kde/gear/angelfish/default.nix @@ -25,9 +25,8 @@ mkKdeDerivation rec { extraNativeBuildInputs = [ rustPlatform.cargoSetupHook cargo - corrosion rustc ]; - extraBuildInputs = [qtsvg qtwebengine qcoro]; + extraBuildInputs = [qtsvg qtwebengine corrosion qcoro]; } diff --git a/pkgs/kde/gear/ghostwriter/default.nix b/pkgs/kde/gear/ghostwriter/default.nix index f4b4a3cee21e3..273e805549e74 100644 --- a/pkgs/kde/gear/ghostwriter/default.nix +++ b/pkgs/kde/gear/ghostwriter/default.nix @@ -12,7 +12,7 @@ mkKdeDerivation { pname = "ghostwriter"; - extraNativeBuildInputs = [pkg-config kdoctools]; - extraBuildInputs = [qtsvg qttools qtwebchannel qtwebengine qt5compat hunspell]; + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtsvg qttools qtwebchannel qtwebengine qt5compat kdoctools hunspell]; meta.mainProgram = "ghostwriter"; } diff --git a/pkgs/kde/gear/kcalc/default.nix b/pkgs/kde/gear/kcalc/default.nix index fdc55b3532782..28f1d314ce964 100644 --- a/pkgs/kde/gear/kcalc/default.nix +++ b/pkgs/kde/gear/kcalc/default.nix @@ -8,7 +8,6 @@ mkKdeDerivation { pname = "kcalc"; - extraNativeBuildInputs = [kdoctools]; - extraBuildInputs = [qt5compat gmp mpfr]; + extraBuildInputs = [qt5compat gmp mpfr kdoctools]; meta.mainProgram = "kcalc"; } diff --git a/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix index e256ee8fdf1dc..fded9e9b02058 100644 --- a/pkgs/kde/gear/kdepim-addons/default.nix +++ b/pkgs/kde/gear/kdepim-addons/default.nix @@ -4,8 +4,8 @@ rustPlatform, cargo, rustc, - corrosion, discount, + corrosion, alpaka, # provided as callPackage input to enable easier overrides through overlays cargoHash ? "sha256-Yt1Gxw9Q1Q108YRJoUIpeNZlGjZ7yabLW3bRO4+x6Vo=", @@ -28,9 +28,8 @@ mkKdeDerivation rec { extraNativeBuildInputs = [ rustPlatform.cargoSetupHook cargo - corrosion rustc ]; - extraBuildInputs = [discount alpaka]; + extraBuildInputs = [discount corrosion alpaka]; } diff --git a/pkgs/kde/gear/kopeninghours/default.nix b/pkgs/kde/gear/kopeninghours/default.nix index b315d765fb396..7ba5214ac09fb 100644 --- a/pkgs/kde/gear/kopeninghours/default.nix +++ b/pkgs/kde/gear/kopeninghours/default.nix @@ -16,5 +16,6 @@ mkKdeDerivation { enablePython = true; python = python3; }) + python3 ]; } -- cgit 1.4.1