diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index be7d2c29cb56..10802b054ec7 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -126,6 +126,8 @@ - `pocket-id` has been updated to version 2 that contains [breaking changes](https://pocket-id.org/docs/setup/major-releases/migrate-v2). +- `services.xserver` will now throw an error if an X11 driver specified in `videoDriver(s)` cannot be found. Previously, unknown drivers would be silently ignored. + - `asio` (standalone version of `boost::asio`) has been updated from 1.24.0 to 1.36.0. Some breaking changes were introduced between these two versions, and the one affected most was the removal of `asio::io_service` in favor of `asio::io_context` in 1.33.0. `asio_1_32_0` is retained for packages that have not completed migration. `asio_1_10` has been removed as no packages depend on it anymore. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5cbc44f1fdeb..606965a0a0e1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12593,6 +12593,12 @@ githubId = 43830312; name = "Joël Miramon"; }; + jmmv = { + email = "julio@meroh.net"; + github = "jmmv"; + githubId = 879272; + name = "Julio Merino"; + }; jn-sena = { email = "jn-sena@proton.me"; github = "jn-sena"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d18909171a7f..fb9c8455c115 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1515,6 +1515,7 @@ ./services/security/reaction.nix ./services/security/shibboleth-sp.nix ./services/security/sks.nix + ./services/security/ssh-agent-switcher.nix ./services/security/sshguard.nix ./services/security/sslmate-agent.nix ./services/security/step-ca.nix diff --git a/nixos/modules/services/misc/autosuspend.nix b/nixos/modules/services/misc/autosuspend.nix index fed0e2c9a06a..9bbc9b2e7af8 100644 --- a/nixos/modules/services/misc/autosuspend.nix +++ b/nixos/modules/services/misc/autosuspend.nix @@ -37,6 +37,7 @@ let # Dependencies needed by specific checks dependenciesForChecks = { + "Ping" = [ pkgs.iputils ]; "Smb" = pkgs.samba; "XIdleTime" = [ pkgs.xprintidle @@ -225,6 +226,13 @@ in }; config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.checks != { }; + message = "`services.autosuspend.checks` must contain at least one activity check."; + } + ]; + systemd.services.autosuspend = { description = "A daemon to suspend your server in case of inactivity"; documentation = [ "https://autosuspend.readthedocs.io/en/latest/systemd_integration.html" ]; @@ -235,16 +243,6 @@ in ExecStart = "${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} daemon"; }; }; - - systemd.services.autosuspend-detect-suspend = { - description = "Notifies autosuspend about suspension"; - documentation = [ "https://autosuspend.readthedocs.io/en/latest/systemd_integration.html" ]; - wantedBy = [ "sleep.target" ]; - after = [ "sleep.target" ]; - serviceConfig = { - ExecStart = "${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} presuspend"; - }; - }; }; meta = { diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 4ad13d9eac08..d85825be5057 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -97,7 +97,7 @@ let ++ ( if (cfg.enableAgentMode) then [ - "--enable-feature=agent" + "--agent" ] else [ diff --git a/nixos/modules/services/security/ssh-agent-switcher.nix b/nixos/modules/services/security/ssh-agent-switcher.nix new file mode 100644 index 000000000000..ed180d63be94 --- /dev/null +++ b/nixos/modules/services/security/ssh-agent-switcher.nix @@ -0,0 +1,43 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.ssh-agent-switcher; +in +{ + meta.maintainers = [ lib.maintainers.jmmv ]; + + options = { + services.ssh-agent-switcher = { + enable = lib.mkEnableOption "ssh-agent-switcher daemon" // { + description = '' + Whether to enable ssh-agent-switcher, a daemon that proxies SSH agent + connections to forwarded agents. This allows tmux/screen sessions to + access SSH agents across reconnections. + + This is a per-user service that automatically starts when you log in + via SSH and sets SSH_AUTH_SOCK to point to a stable socket location. + + Note: This only activates for SSH sessions, not graphical or console logins. + ''; + }; + + package = lib.mkPackageOption pkgs "ssh-agent-switcher" { }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + environment.loginShellInit = '' + if [ -n "$SSH_CONNECTION" ]; then + mkdir -p "''${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" + export SSH_AUTH_SOCK="''${XDG_RUNTIME_DIR:-/run/user/$(id -u)}/ssh-agent-switcher.sock" + ${lib.getExe cfg.package} --daemon --socket-path="$SSH_AUTH_SOCK" 2>/dev/null || true + fi + ''; + }; +} diff --git a/nixos/modules/services/web-apps/firefly-iii-data-importer.nix b/nixos/modules/services/web-apps/firefly-iii-data-importer.nix index 820d2c819101..e62d0d1de40e 100644 --- a/nixos/modules/services/web-apps/firefly-iii-data-importer.nix +++ b/nixos/modules/services/web-apps/firefly-iii-data-importer.nix @@ -267,6 +267,7 @@ in "${cfg.dataDir}/storage/framework/sessions" "${cfg.dataDir}/storage/framework/testing" "${cfg.dataDir}/storage/framework/views" + "${cfg.dataDir}/storage/import-jobs" "${cfg.dataDir}/storage/jobs" "${cfg.dataDir}/storage/logs" "${cfg.dataDir}/storage/submission-routines" diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 89174b6b9d98..fd52b0023d94 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -830,7 +830,8 @@ in services.xserver.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ]; - # FIXME: somehow check for unknown driver names. + # We ignore unknown drivers here because they may be resolved by other modules (e.g., the Nvidia + # module). We assert that all specified drivers were eventually found in the assertions below. services.xserver.drivers = flip concatMap cfg.videoDrivers ( name: lib.optional (videoDrivers ? ${name}) ( @@ -862,7 +863,11 @@ in assertion = cfg.upscaleDefaultCursor -> cfg.dpi != null; message = "Specify `config.services.xserver.dpi` to upscale the default cursor."; } - ]; + ] + ++ map (driver: { + assertion = builtins.elem driver (builtins.catAttrs "name" cfg.drivers); + message = "Unknown X11 driver ‘${driver}’ specified in `services.xserver.videoDrivers`."; + }) cfg.videoDrivers; environment.etc = (optionalAttrs cfg.exportConfiguration { diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 78b51b2e4a52..a4c56e474fba 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -257,6 +257,7 @@ in authelia = runTest ./authelia.nix; auto-cpufreq = runTest ./auto-cpufreq.nix; autobrr = runTest ./autobrr.nix; + autosuspend = runTest ./autosuspend.nix; avahi = runTest { imports = [ ./avahi.nix ]; _module.args.networkd = false; diff --git a/nixos/tests/autosuspend.nix b/nixos/tests/autosuspend.nix new file mode 100644 index 000000000000..ef78e3215dc8 --- /dev/null +++ b/nixos/tests/autosuspend.nix @@ -0,0 +1,30 @@ +{ lib, pkgs, ... }: + +{ + name = "autosuspend"; + meta.maintainers = [ lib.maintainers.anthonyroussel ]; + + nodes = { + machine = { + services.autosuspend = { + enable = true; + + settings = { + interval = 5; + idle_time = 5; + suspend_cmd = "${pkgs.coreutils}/bin/touch /tmp/suspended"; + }; + + # Return exit code 1 to trigger suspend + checks.ExternalCommand.command = "exit 1"; + }; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("autosuspend.service") + machine.wait_for_file("/tmp/suspended") + ''; +} diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 3a27ec0e9584..2b938c7c57da 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -59,7 +59,9 @@ stdenv.mkDerivation rec { ++ lib.optional pipewireSupport pipewire ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; - TARGET = lib.optionalString stdenv.hostPlatform.isDarwin "MACOS"; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + TARGET = "MACOS"; + }; cmakeFlags = [ (lib.cmakeBool "BUILD_WITH_PULSE" pulseaudioSupport) diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix index 555fcc798db2..a2b7ac852141 100644 --- a/pkgs/applications/emulators/libretro/cores/flycast.nix +++ b/pkgs/applications/emulators/libretro/cores/flycast.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "flycast"; - version = "0-unstable-2026-02-06"; + version = "0-unstable-2026-02-16"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "c577e29f43edc5a86c6ed4edca46706000d214b2"; - hash = "sha256-nHMtXwtrgxoN/tuY1d+DqZAJFag8vmHAP/9tS2j3ErU="; + rev = "ba5b3c71ecc966e52f698f41443e7cc9b81bf824"; + hash = "sha256-tbq+NgbZDKMg0K0cWF1+7h80QTaAaO5BD9nf94z5fc0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix index 5ac38f7db782..61cae422b3a3 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { xapian zlib ]; - XAPIAN_CONFIG = "${xapian}/bin/xapian-config"; + env.XAPIAN_CONFIG = "${xapian}/bin/xapian-config"; meta = { description = "Synchronize maildirs and notmuch databases"; mainProgram = "muchsync"; diff --git a/pkgs/by-name/ad/adoptopenjdk-icedtea-web/package.nix b/pkgs/by-name/ad/adoptopenjdk-icedtea-web/package.nix index ddbd9a2d9f0c..6695557259d2 100644 --- a/pkgs/by-name/ad/adoptopenjdk-icedtea-web/package.nix +++ b/pkgs/by-name/ad/adoptopenjdk-icedtea-web/package.nix @@ -62,8 +62,10 @@ stdenv.mkDerivation (finalAttrs: { touch $XDG_CONFIG_HOME/icedtea-web/deployment.properties ''; - HOME = "/build"; - XDG_CONFIG_HOME = "/build"; + env = { + HOME = "/build"; + XDG_CONFIG_HOME = "/build"; + }; configureFlags = [ "--with-itw-libs=DISTRIBUTION" diff --git a/pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix b/pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix index a6cd86a9178c..ecbb9bc3bec5 100644 --- a/pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix +++ b/pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix @@ -6,12 +6,12 @@ }: anki-utils.buildAnkiAddon (finalAttrs: { pname = "anki-quizlet-importer-extended"; - version = "2025.09.28"; + version = "2026.01.17"; src = fetchFromGitHub { owner = "sviatoslav-lebediev"; repo = "anki-quizlet-importer-extended"; tag = "v${finalAttrs.version}"; - hash = "sha256-j/ow/HCc70dD/BpMDqGx7rib7G0FfxazzjuPmEQbYTk="; + hash = "sha256-BTddZColXM193x8xFa1axHeiWukjxXvwkXGpHxsLtR0="; }; passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index da86620b8d7b..0ca10501e6db 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/ui/yarn.lock"; - hash = "sha256-ekhSPWzIgFhwSw0bIlBqu8LTYk3vuJ9VM8eHc3mnHGM="; + hash = "sha256-kqBolkQiwZUBic0f+Ek5HwYsOmro1+FStkDLXAre79o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix index da374e413f20..236234cee014 100644 --- a/pkgs/by-name/au/audit/package.nix +++ b/pkgs/by-name/au/audit/package.nix @@ -175,5 +175,10 @@ stdenv.mkDerivation (finalAttrs: { "auparse" ]; platforms = lib.platforms.linux; + identifiers.cpeParts = + lib.meta.cpeFullVersionWithVendor "linux_audit_project" finalAttrs.version + // { + product = "linux_audit"; + }; }; }) diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix index 2f8862c465d9..bc8dfbc8a694 100644 --- a/pkgs/by-name/au/autosuspend/package.nix +++ b/pkgs/by-name/au/autosuspend/package.nix @@ -2,21 +2,46 @@ lib, dbus, fetchFromGitHub, + nixosTests, python3, + sphinxHook, + withDocs ? true, + withMan ? true, }: python3.pkgs.buildPythonApplication (finalAttrs: { pname = "autosuspend"; - version = "9.0.1"; + version = "10.0.0"; pyproject = true; + outputs = [ + "out" + ] + ++ lib.optionals withDocs [ "doc" ] + ++ lib.optionals withMan [ "man" ]; + src = fetchFromGitHub { owner = "languitar"; repo = "autosuspend"; tag = "v${finalAttrs.version}"; - hash = "sha256-PVxsdCPGu+bhjfAF5Hu4Xa3lETARitbBUKuy7ursAUE="; + hash = "sha256-o9Jpb4i2/SJ3s3h5sclNjpaN/UFk1YbpPf7b3rGXLRg="; }; + postPatch = '' + # This mapping triggers network access on docs generation + substituteInPlace doc/source/conf.py \ + --replace-fail 'intersphinx_mapping' '# intersphinx_mapping' + ''; + + nativeBuildInputs = lib.optionals (withDocs || withMan) ( + [ + sphinxHook + ] + ++ finalAttrs.passthru.optional-dependencies.docs + ); + + sphinxBuilders = lib.optionals withDocs [ "html" ] ++ lib.optionals withMan [ "man" ]; + build-system = with python3.pkgs; [ setuptools ]; @@ -27,8 +52,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: { jsonpath-ng lxml mpd2 - portalocker psutil + pygobject3 python-dateutil requests requests-file @@ -36,6 +61,16 @@ python3.pkgs.buildPythonApplication (finalAttrs: { tzlocal ]; + optional-dependencies = { + docs = with python3.pkgs; [ + furo + recommonmark + sphinx-autodoc-typehints + sphinx-issues + sphinxcontrib-plantuml + ]; + }; + nativeCheckInputs = with python3.pkgs; [ dbus freezegun @@ -53,6 +88,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: { "test_multiple_sessions" ]; + passthru.tests = { + inherit (nixosTests) autosuspend; + }; + meta = { description = "Daemon to automatically suspend and wake up a system"; homepage = "https://autosuspend.readthedocs.io"; diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix index 5f61347de915..df352c0eab12 100644 --- a/pkgs/by-name/av/avalonia/package.nix +++ b/pkgs/by-name/av/avalonia/package.nix @@ -70,11 +70,21 @@ stdenvNoCC.mkDerivation ( ./0004-disable-windows-desktop.patch ]; - # this needs to be match the version being patched above - UNICODE_CHARACTER_DATABASE = fetchzip { - url = "https://www.unicode.org/Public/15.0.0/ucd/UCD.zip"; - hash = "sha256-jj6bX46VcnH7vpc9GwM9gArG+hSPbOGL6E4SaVd0s60="; - stripRoot = false; + env = { + # this needs to be match the version being patched above + UNICODE_CHARACTER_DATABASE = fetchzip { + url = "https://www.unicode.org/Public/15.0.0/ucd/UCD.zip"; + hash = "sha256-jj6bX46VcnH7vpc9GwM9gArG+hSPbOGL6E4SaVd0s60="; + stripRoot = false; + }; + FONTCONFIG_FILE = + let + fc = makeFontsConf { fontDirectories = [ liberation_ttf ]; }; + in + runCommand "fonts.conf" { } '' + substitute ${fc} $out \ + --replace-fail "/etc/" "${fontconfig.out}/etc/" + ''; }; postPatch = '' @@ -142,15 +152,6 @@ stdenvNoCC.mkDerivation ( # - NuGet packages config '/build/source/nukebuild/_build.csproj' linkNuGetPackagesAndSources = true; - FONTCONFIG_FILE = - let - fc = makeFontsConf { fontDirectories = [ liberation_ttf ]; }; - in - runCommand "fonts.conf" { } '' - substitute ${fc} $out \ - --replace-fail "/etc/" "${fontconfig.out}/etc/" - ''; - preConfigure = '' # closed source (telemetry?) https://github.com/AvaloniaUI/Avalonia/discussions/16878 dotnet remove packages/Avalonia/Avalonia.csproj package Avalonia.BuildServices diff --git a/pkgs/by-name/bo/boehmgc/package.nix b/pkgs/by-name/bo/boehmgc/package.nix index d4616fbd002b..136d9e9c005f 100644 --- a/pkgs/by-name/bo/boehmgc/package.nix +++ b/pkgs/by-name/bo/boehmgc/package.nix @@ -120,5 +120,10 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.boehmGC; maintainers = [ ]; platforms = lib.platforms.all; + identifiers.cpeParts = + lib.meta.cpeFullVersionWithVendor "boehm-demers-weiser" finalAttrs.version + // { + product = "garbage_collector"; + }; }; }) diff --git a/pkgs/by-name/bu/bulloak/package.nix b/pkgs/by-name/bu/bulloak/package.nix index bbd25cc0ab8c..39bd57007466 100644 --- a/pkgs/by-name/bu/bulloak/package.nix +++ b/pkgs/by-name/bu/bulloak/package.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { doCheck = false; # provide the list of solc versions to the `svm-rs-builds` dependency - SVM_RELEASES_LIST_JSON = + env.SVM_RELEASES_LIST_JSON = solc-versions.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/ca/cacert/package.nix b/pkgs/by-name/ca/cacert/package.nix index ccfb2b777d96..bb52e8104f18 100644 --- a/pkgs/by-name/ca/cacert/package.nix +++ b/pkgs/by-name/ca/cacert/package.nix @@ -34,6 +34,9 @@ let lukegb ]; license = lib.licenses.mpl20; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "mozilla" version // { + product = "nss"; + }; }; certdata = stdenv.mkDerivation { pname = "nss-cacert-certdata"; diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix index f9658022a785..b8028f7e9384 100644 --- a/pkgs/by-name/cf/cfspeedtest/package.nix +++ b/pkgs/by-name/cf/cfspeedtest/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cfspeedtest"; - version = "2.0.3"; + version = "2.2.0"; src = fetchFromGitHub { owner = "code-inflation"; repo = "cfspeedtest"; tag = "v${finalAttrs.version}"; - hash = "sha256-KeJ/p9kXfI3OuAyNUx2C6DKpmtL3239uHpWAf4mDr4Q="; + hash = "sha256-EVZFmTjv2j7kax4MC5HTkVa7/IiDNZcIOgsntSGfzG4="; }; - cargoHash = "sha256-mXSbbY3nuhEw+QUk6gt71HIh2gKNBO6C0trZbyzbpnM="; + cargoHash = "sha256-cA+eRVZiZL+bbPc+Vr7nkwMLbQBKOO3uU0XzrxVajqg="; nativeBuildInputs = [ installShellFiles ]; @@ -28,6 +28,18 @@ rustPlatform.buildRustPackage (finalAttrs: { --zsh <($out/bin/cfspeedtest --generate-completion zsh) ''; + # require internet access + checkFlags = map (t: "--skip=${t}") [ + "speedtest::tests::test_fetch_metadata_integration" + "speedtest::tests::test_run_tests_does_not_retry_non_retryable_4xx" + "speedtest::tests::test_run_tests_retries_429_and_records_success" + "speedtest::tests::test_run_tests_retry_delay_resets_after_success" + "speedtest::tests::test_run_tests_retry_delay_uses_retry_streak_not_total_attempts" + "speedtest::tests::test_run_tests_stops_after_max_attempts_on_retryable_failures" + "speedtest::tests::test_upload_duration_excludes_delayed_response_body" + "speedtest::tests::test_upload_retryable_failure_parses_retry_after_without_drain_skew" + ]; + meta = { description = "Unofficial CLI for speed.cloudflare.com"; homepage = "https://github.com/code-inflation/cfspeedtest"; diff --git a/pkgs/by-name/cl/clightd/package.nix b/pkgs/by-name/cl/clightd/package.nix index c5f7223b9a32..93bef232b79e 100644 --- a/pkgs/by-name/cl/clightd/package.nix +++ b/pkgs/by-name/cl/clightd/package.nix @@ -39,10 +39,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-LOhBBd7QL5kH4TzMFgrh70C37WsFdsiKArP+tIEiPWo="; }; - # dbus-1.pc has datadir=/etc - SYSTEM_BUS_DIR = "${placeholder "out"}/share/dbus-1/system-services"; - # polkit-gobject-1.pc has prefix=${polkit.out} - POLKIT_ACTION_DIR = "${placeholder "out"}/share/polkit-1/actions"; + env = { + # dbus-1.pc has datadir=/etc + SYSTEM_BUS_DIR = "${placeholder "out"}/share/dbus-1/system-services"; + # polkit-gobject-1.pc has prefix=${polkit.out} + POLKIT_ACTION_DIR = "${placeholder "out"}/share/polkit-1/actions"; + }; postPatch = '' sed -i "s@pkg_get_variable(SYSTEM_BUS_DIR.*@set(SYSTEM_BUS_DIR $SYSTEM_BUS_DIR)@" CMakeLists.txt diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix index 18e16acac43e..d50c76760ef4 100644 --- a/pkgs/by-name/co/cog/package.nix +++ b/pkgs/by-name/co/cog/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "cog"; - version = "0.0.52"; + version = "0.0.56"; src = fetchFromGitHub { owner = "grafana"; repo = "cog"; tag = "v${finalAttrs.version}"; - hash = "sha256-BebTJZo9bL6xQY0njfLzyeElTgnnJsizGY2G7D9ClXI="; + hash = "sha256-puD0Xlap4yBoAXyhmK+AUSkqiungQsYqkW28BapscEU="; }; - vendorHash = "sha256-S0P65rjIMcDWcJxGyk9aR46bsVXdvVWSt+MLJ4tLdqc="; + vendorHash = "sha256-WIYV1kqV5Cr49FDIa1GuR9Cnav/x09v3SwHhUAwqdhM="; subPackages = [ "cmd/cli" ]; diff --git a/pkgs/by-name/da/dawarich/package.nix b/pkgs/by-name/da/dawarich/package.nix index 81154d401d6d..c2b9b425f16d 100644 --- a/pkgs/by-name/da/dawarich/package.nix +++ b/pkgs/by-name/da/dawarich/package.nix @@ -64,10 +64,12 @@ stdenv.mkDerivation (finalAttrs: { hash = sources.npmHash; }; - RAILS_ENV = "production"; - NODE_ENV = "production"; - REDIS_URL = ""; # build error if not defined - TAILWINDCSS_INSTALL_DIR = "${tailwindcss_3}/bin"; + env = { + RAILS_ENV = "production"; + NODE_ENV = "production"; + REDIS_URL = ""; # build error if not defined + TAILWINDCSS_INSTALL_DIR = "${tailwindcss_3}/bin"; + }; nativeBuildInputs = [ nodejs diff --git a/pkgs/by-name/de/deadlock-mod-manager/package.nix b/pkgs/by-name/de/deadlock-mod-manager/package.nix index 68510994039c..66fa7a6a4829 100644 --- a/pkgs/by-name/de/deadlock-mod-manager/package.nix +++ b/pkgs/by-name/de/deadlock-mod-manager/package.nix @@ -86,7 +86,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ./no-updater-artifacts.patch ]; - VITE_API_URL = "https://api.deadlockmods.app"; + env.VITE_API_URL = "https://api.deadlockmods.app"; # Skip tests that require network access checkFlags = [ diff --git a/pkgs/by-name/di/digitalbitbox/package.nix b/pkgs/by-name/di/digitalbitbox/package.nix index c07c6f8df244..737916a5f516 100644 --- a/pkgs/by-name/di/digitalbitbox/package.nix +++ b/pkgs/by-name/di/digitalbitbox/package.nix @@ -84,12 +84,14 @@ stdenv.mkDerivation (finalAttrs: { libsForQt5.qtmultimedia ]; - LUPDATE = "${libsForQt5.qttools.dev}/bin/lupdate"; - LRELEASE = "${libsForQt5.qttools.dev}/bin/lrelease"; - MOC = "${libsForQt5.qtbase.dev}/bin/moc"; - QTDIR = libsForQt5.qtbase.dev; - RCC = "${libsForQt5.qtbase.dev}/bin/rcc"; - UIC = "${libsForQt5.qtbase.dev}/bin/uic"; + env = { + LUPDATE = "${libsForQt5.qttools.dev}/bin/lupdate"; + LRELEASE = "${libsForQt5.qttools.dev}/bin/lrelease"; + MOC = "${libsForQt5.qtbase.dev}/bin/moc"; + QTDIR = libsForQt5.qtbase.dev; + RCC = "${libsForQt5.qtbase.dev}/bin/rcc"; + UIC = "${libsForQt5.qtbase.dev}/bin/uic"; + }; configureFlags = [ "--enable-libusb" diff --git a/pkgs/by-name/en/entr/package.nix b/pkgs/by-name/en/entr/package.nix index 497658013547..daef393b4ffb 100644 --- a/pkgs/by-name/en/entr/package.nix +++ b/pkgs/by-name/en/entr/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { checkTarget = "test"; installFlags = [ "PREFIX=$(out)" ]; - TARGET_OS = stdenv.hostPlatform.uname.system; + env.TARGET_OS = stdenv.hostPlatform.uname.system; meta = { homepage = "https://eradman.com/entrproject/"; diff --git a/pkgs/by-name/ev/evdev-proto/package.nix b/pkgs/by-name/ev/evdev-proto/package.nix index ed4e1acf7f50..db41ff6b7ac8 100644 --- a/pkgs/by-name/ev/evdev-proto/package.nix +++ b/pkgs/by-name/ev/evdev-proto/package.nix @@ -19,28 +19,30 @@ stdenv.mkDerivation { nativeBuildInputs = [ freebsd.makeMinimal ]; - ARCH = freebsd.makeMinimal.MACHINE_ARCH; - OPSYS = "FreeBSD"; - _OSRELEASE = "${lib.versions.majorMinor freebsd.makeMinimal.version}-RELEASE"; + env = { + ARCH = freebsd.makeMinimal.MACHINE_ARCH; + OPSYS = "FreeBSD"; + _OSRELEASE = "${lib.versions.majorMinor freebsd.makeMinimal.version}-RELEASE"; - AWK = "awk"; - CHMOD = "chmod"; - FIND = "find"; - MKDIR = "mkdir -p"; - PKG_BIN = "${buildPackages.pkg}/bin/pkg"; - RM = "rm -f"; - SED = "${buildPackages.freebsd.sed}/bin/sed"; - SETENV = "env"; - SH = "sh"; - TOUCH = "touch"; - XARGS = "xargs"; + AWK = "awk"; + CHMOD = "chmod"; + FIND = "find"; + MKDIR = "mkdir -p"; + PKG_BIN = "${buildPackages.pkg}/bin/pkg"; + RM = "rm -f"; + SED = "${buildPackages.freebsd.sed}/bin/sed"; + SETENV = "env"; + SH = "sh"; + TOUCH = "touch"; + XARGS = "xargs"; - ABI_FILE = runCommandCC "abifile" { } "$CC -shared -o $out"; - CLEAN_FETCH_ENV = true; - INSTALL_AS_USER = true; - NO_CHECKSUM = true; - NO_MTREE = true; - SRC_BASE = freebsd.source; + ABI_FILE = runCommandCC "abifile" { } "$CC -shared -o $out"; + CLEAN_FETCH_ENV = true; + INSTALL_AS_USER = true; + NO_CHECKSUM = true; + NO_MTREE = true; + SRC_BASE = freebsd.source; + }; preUnpack = '' export MAKE_JOBS_NUMBER="$NIX_BUILD_CORES" diff --git a/pkgs/by-name/ev/evil-helix/package.nix b/pkgs/by-name/ev/evil-helix/package.nix index 692fe89ddeda..1a4f783bc4d4 100644 --- a/pkgs/by-name/ev/evil-helix/package.nix +++ b/pkgs/by-name/ev/evil-helix/package.nix @@ -25,15 +25,11 @@ rustPlatform.buildRustPackage (finalAttrs: { env = { # disable fetching and building of tree-sitter grammars in the helix-term build.rs HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1"; - HELIX_DEFAULT_RUNTIME = "${placeholder "out"}/lib/runtime"; + HELIX_DEFAULT_RUNTIME = helix.runtime; }; postInstall = '' mkdir -p $out/lib - cp -r runtime $out/lib - # copy tree-sitter grammars from helix package - # TODO: build it from source instead - cp -r ${helix}/lib/runtime/grammars/* $out/lib/runtime/grammars/ installShellCompletion contrib/completion/hx.{bash,fish,zsh} mkdir -p $out/share/{applications,icons/hicolor/256x256/apps} cp contrib/Helix.desktop $out/share/applications diff --git a/pkgs/by-name/ex/extism-js/package.nix b/pkgs/by-name/ex/extism-js/package.nix index 6c7d2e8d217c..4c8d0f5f24b4 100644 --- a/pkgs/by-name/ex/extism-js/package.nix +++ b/pkgs/by-name/ex/extism-js/package.nix @@ -12,14 +12,14 @@ }: let - version = "1.5.1"; + version = "1.6.0"; tag = "v${version}"; system = lib.replaceStrings [ "darwin" ] [ "macos" ] stdenvNoCC.hostPlatform.system; hashes = { - aarch64-darwin = "sha256-BHld8Dwwd6fexc05oHOIawa5PtGZAI61wQGWE8T+iMs="; - aarch64-linux = "sha256-KM3/y31OdLmEAcc48TSLmXei2GD6FhOHYlD7W/ErP+I="; - x86_64-darwin = "sha256-cE0JJK92pTJyGnHEZ7wA6+dpMvVOTMzFM2Mkwfy5kbQ="; - x86_64-linux = "sha256-9qSjqPFmUaUnpGQ/ldIpyFSgTWbUYozcckpYxpm5PJU="; + aarch64-darwin = "sha256-VI4lvaOXGgfDLXiiSRNc+Mt7Pu3hAeh44G5T4BrC4M4="; + aarch64-linux = "sha256-FaGGJQ5o1r/07IOf/yddRakOODppIJ3MEjnrnjrubhs="; + x86_64-darwin = "sha256-2FqHXCoHHwwp/lcnZMUsOkmfFXq3+e+siTmkNkOQ4ps="; + x86_64-linux = "sha256-Te0nHM9GUDHM0Nw156FA4TTX8wchZxzEqOH/gF1KrWg="; }; in stdenvNoCC.mkDerivation { @@ -61,6 +61,11 @@ stdenvNoCC.mkDerivation { versionCheckHook ]; + # https://github.com/extism/js-pdk/pull/154 + preInstallCheck = '' + version=1.5.1 + ''; + meta = { changelog = "https://github.com/extism/js-pdk/releases/tag/${tag}"; description = "Write Extism plugins in JavaScript & TypeScript"; diff --git a/pkgs/by-name/ga/gallia/package.nix b/pkgs/by-name/ga/gallia/package.nix index 93aaf75816c8..88a4187535e7 100644 --- a/pkgs/by-name/ga/gallia/package.nix +++ b/pkgs/by-name/ga/gallia/package.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { zstandard ]; - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; nativeCheckInputs = with python3.pkgs; diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index a65002d09af3..f0dc6420b731 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.237.0"; + version = "2.239.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-udko0oiO5tLEDBKxkGiTRU0Qd/Yd0bvPB6iPM5wJ7Ls="; + hash = "sha256-1CJM395lApSIo5/7WVaLaBV1MwNJ7ehWukln59Ew6fg="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-2j/u++63qaOzvsgdhWeDsH+TUVmOLvgQQRNY14LZI2k="; + npmDepsHash = "sha256-rX/RkM2wjDFoL/BtnNa3WuUlHIIlviGGsfoobDzeD0M="; nativeBuildInputs = [ prisma_6 diff --git a/pkgs/by-name/gi/git-cinnabar/package.nix b/pkgs/by-name/gi/git-cinnabar/package.nix index 8cb3f3b54b2e..637d68cf2f9e 100644 --- a/pkgs/by-name/gi/git-cinnabar/package.nix +++ b/pkgs/by-name/gi/git-cinnabar/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-IVizzc2dKZ83dz3KBMDDiaFNdnS40cS++k8AywyvakQ="; }; - ZSTD_SYS_USE_PKG_CONFIG = true; + env.ZSTD_SYS_USE_PKG_CONFIG = true; enableParallelBuilding = true; diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix index b4f9e6f5e615..df72922fd8c6 100644 --- a/pkgs/by-name/gi/gitlab-timelogs/package.nix +++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { pname = "gitlab-timelogs"; - version = "0.7.0"; + version = "0.7.1"; src = fetchCrate { inherit pname version; - hash = "sha256-WmdN3w0t7omA2F+Fpv+PkT/hymgTzxlTSBytKep+6Lo="; + hash = "sha256-DNMJczR4yaglIOcNmb2E1g+UP0VeJaIb5TvdKUcWzc0="; }; nativeBuildInputs = [ pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { iconv ]; - cargoHash = "sha256-Ap/R/Sa60LUAKByzKGYzj/IZeq/UDiZzBxYY0Ell6Kw="; + cargoHash = "sha256-aCt534oDG9u37xLQjG7Ye+EKpTgW4q/LqaVkxw5iEJ0="; meta = { description = "CLI utility to support you with your time logs in GitLab"; diff --git a/pkgs/by-name/go/goconvey/package.nix b/pkgs/by-name/go/goconvey/package.nix index 8b2d69f3bbf4..dc4992e8a06e 100644 --- a/pkgs/by-name/go/goconvey/package.nix +++ b/pkgs/by-name/go/goconvey/package.nix @@ -1,26 +1,36 @@ { lib, fetchFromGitHub, - # Build fails with Go 1.25, with the following error: - # 'vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go:64:9: invalid array length -delta * delta (constant -256 of type int64)' - # Wait for upstream to update their vendored dependencies before unpinning. - buildGo124Module, + fetchpatch, + applyPatches, + buildGoModule, }: -buildGo124Module { +buildGoModule { pname = "goconvey"; version = "1.8.1-unstable-2024-03-06"; excludedPackages = "web/server/watch/integration_testing"; - src = fetchFromGitHub { - owner = "smartystreets"; - repo = "goconvey"; - rev = "a50310f1e3e53e63e2d23eb904f853aa388a5988"; - hash = "sha256-w5eX/n6Wu2gYgCIhgtjqH3lNckWIDaN4r80cJW3JqFo="; + src = applyPatches { + src = fetchFromGitHub { + owner = "smartystreets"; + repo = "goconvey"; + rev = "a50310f1e3e53e63e2d23eb904f853aa388a5988"; + hash = "sha256-w5eX/n6Wu2gYgCIhgtjqH3lNckWIDaN4r80cJW3JqFo="; + }; + patches = [ + # Update golang.org/x/tools to v0.42.0 for Go 1.25+ compatibility + # https://github.com/smartystreets/goconvey/pull/703 + (fetchpatch { + url = "https://github.com/smartystreets/goconvey/commit/a8d73b2e5380902ab6caa6716ad69c324f390a2d.patch"; + hash = "sha256-4JZs4/kxt3KP21q4U8mpBJkueVmRsCsKqST1Cn6ySN8="; + }) + ]; }; - vendorHash = "sha256-P4J/CZY95ks08DC+gSqG+eanL3zoiaoz1d9/ZvBoc9Q="; + proxyVendor = true; + vendorHash = "sha256-0LQ5yxqy+WGc9TzmXiiHYyUNIIImoLsItkv5KcHjVGc="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index 05eca0f72a34..8a351907cc59 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -14,16 +14,16 @@ buildGo126Module (finalAttrs: { pname = "golangci-lint"; - version = "2.9.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; tag = "v${finalAttrs.version}"; - hash = "sha256-8LEtm1v0slKwdLBtS41OilKJLXytSxcI9fUlZbj5Gfw="; + hash = "sha256-rHttQ+QJ9JrFvgfoX68Y0lD6BUv/aoOpRRFvZ1BIGIs="; }; - vendorHash = "sha256-w8JfF6n1ylrU652HEv/cYdsOdDZz9J2uRQDqxObyhkY="; + vendorHash = "sha256-yREpROQJ300+mii7R2oiyDjOGcYXBpv3o/park0TJYE="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/pkgs/by-name/he/helix/generate_grammars.py b/pkgs/by-name/he/helix/generate_grammars.py new file mode 100755 index 000000000000..2e5b55ea5f9e --- /dev/null +++ b/pkgs/by-name/he/helix/generate_grammars.py @@ -0,0 +1,155 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 nurl +""" +Generate grammar information for Helix editor by parsing languages.toml +and fetching source information using nurl in parallel. +""" + +import argparse +import asyncio +import json +import os +import sys +import tomllib +from dataclasses import dataclass +from pathlib import Path +from typing import Any + + +@dataclass +class Grammar: + name: str + git_url: str + rev: str + subpath: str | None = None + + +async def run_nurl(url: str, rev: str, semaphore: asyncio.Semaphore) -> dict[str, Any]: + """Run nurl command for a single grammar and return parsed JSON output.""" + async with semaphore: + proc = await asyncio.create_subprocess_exec( + "nurl", + url, + rev, + "--json", + stdout=asyncio.subprocess.PIPE, + stderr=asyncio.subprocess.PIPE, + ) + stdout, stderr = await proc.communicate() + + if proc.returncode != 0: + raise RuntimeError(f"nurl failed for {url}@{rev}: {stderr.decode()}") + + return json.loads(stdout.decode()) + + +def parse_languages_toml(toml_path: Path) -> list[Grammar]: + """Parse languages.toml and extract grammar information.""" + with open(toml_path, "rb") as f: + config = tomllib.load(f) + + grammars = [] + for grammar in config.get("grammar", []): + if "source" not in grammar: + continue + + source = grammar["source"] + if "git" not in source or "rev" not in source: + continue + + grammars.append( + Grammar( + name=grammar["name"].replace("_", "-"), + git_url=source["git"], + rev=source["rev"], + subpath=source.get("subpath"), + ) + ) + + return grammars + + +async def fetch_all_grammars( + grammars: list[Grammar], max_parallel: int +) -> dict[str, Any]: + """Fetch nurl information for all grammars in parallel.""" + semaphore = asyncio.Semaphore(max_parallel) + results = {} + total = len(grammars) + completed = 0 + + tasks = [] + for grammar in grammars: + task = run_nurl(grammar.git_url, grammar.rev, semaphore) + tasks.append((grammar, task)) + + for grammar, task in tasks: + try: + result = await task + results[grammar.name] = { + "nurl": result, + "subpath": grammar.subpath, + } + completed += 1 + print(f"[{completed}/{total}] ✓ {grammar.name}", file=sys.stderr) + except Exception as e: + completed += 1 + print(f"[{completed}/{total}] ✗ {grammar.name}: {e}", file=sys.stderr) + results[grammar.name] = {"error": str(e)} + + return results + + +async def main(): + parser = argparse.ArgumentParser( + description="Generate grammar information for Helix editor" + ) + parser.add_argument( + "languages_toml", + type=Path, + help="path to languages.toml from Helix repository", + ) + parser.add_argument( + "-o", + "--output", + type=Path, + default=Path("grammars.json"), + help="output JSON file (default: grammars.json)", + ) + parser.add_argument( + "-j", + "--jobs", + type=int, + default=os.cpu_count(), + help=f"number of parallel nurl instances (default: {os.cpu_count()})", + ) + + args = parser.parse_args() + + if not args.languages_toml.exists(): + print(f"Error: {args.languages_toml} not found", file=sys.stderr) + sys.exit(1) + + print(f"Parsing {args.languages_toml}...", file=sys.stderr) + grammars = parse_languages_toml(args.languages_toml) + print(f"Found {len(grammars)} grammars", file=sys.stderr) + + print(f"Fetching grammar information ({args.jobs} parallel jobs)...", file=sys.stderr) + results = await fetch_all_grammars(grammars, args.jobs) + + errors = [name for name, data in results.items() if "error" in data] + if errors: + print(f"\nFailed grammars ({len(errors)}):", file=sys.stderr) + for name in errors: + print(f" - {name}: {results[name]['error']}", file=sys.stderr) + sys.exit(1) + + with open(args.output, "w") as f: + json.dump(results, f, indent=2) + f.write('\n') + + print(f"\nResults written to {args.output}", file=sys.stderr) + + +if __name__ == "__main__": + asyncio.run(main()) diff --git a/pkgs/by-name/he/helix/grammars.json b/pkgs/by-name/he/helix/grammars.json new file mode 100644 index 000000000000..e2892ce5efce --- /dev/null +++ b/pkgs/by-name/he/helix/grammars.json @@ -0,0 +1,2967 @@ +{ + "rust": { + "nurl": { + "args": { + "hash": "sha256-HV7zMwO3ZMaHqX5cV43iwuC+QM7ecApZ2U/hbXuM34c=", + "owner": "tree-sitter", + "repo": "tree-sitter-rust", + "rev": "1f63b33efee17e833e0ea29266dd3d713e27e321" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "sway": { + "nurl": { + "args": { + "hash": "sha256-bYAIprYyqELNsWPZ86IZRtSeauOPCBaRmQ35ePrXODU=", + "owner": "FuelLabs", + "repo": "tree-sitter-sway", + "rev": "e491a005ee1d310f4c138bf215afd44cfebf959c" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "toml": { + "nurl": { + "args": { + "hash": "sha256-jcGcbGqBi63YaqxIXswGk3fycXPILEW50mOFLcaXNwA=", + "owner": "ikatyang", + "repo": "tree-sitter-toml", + "rev": "7cff70bbcbbc62001b465603ca1ea88edd668704" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "awk": { + "nurl": { + "args": { + "hash": "sha256-A/mvLYD9+Ms/nBdAebBF2edVkFUkWyz3TiEIt4G5iWc=", + "owner": "Beaglefoot", + "repo": "tree-sitter-awk", + "rev": "a799bc5da7c2a84bc9a06ba5f3540cf1191e4ee3" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "proto": { + "nurl": { + "args": { + "hash": "sha256-r5xgv5k/OvSES/TfG3Wupfxgmu/n6xtXbSq/4M62jP8=", + "owner": "sdoerner", + "repo": "tree-sitter-proto", + "rev": "778ab6ed18a7fcf82c83805a87d63376c51e80bc" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "textproto": { + "nurl": { + "args": { + "hash": "sha256-VAj8qSxbkFqNp0X8BOZNvGTggSXZvzDjODedY11J0BQ=", + "owner": "PorterAtGoogle", + "repo": "tree-sitter-textproto", + "rev": "568471b80fd8793d37ed01865d8c2208a9fefd1b" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "elixir": { + "nurl": { + "args": { + "hash": "sha256-OM2RWQNdYMltYwmbU5f4ZK5a8Wx4JxBMYx9R5n2B4jg=", + "owner": "elixir-lang", + "repo": "tree-sitter-elixir", + "rev": "02a6f7fd4be28dd94ee4dd2ca19cb777053ea74e" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "fennel": { + "nurl": { + "args": { + "hash": "sha256-0LusII7BPGFQTyEkxZi6h9HUDF0eHvGwA4fiQE2h3YQ=", + "owner": "alexmozaidze", + "repo": "tree-sitter-fennel", + "rev": "cfbfa478dc2dbef267ee94ae4323d9c886f45e94" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "fish": { + "nurl": { + "args": { + "hash": "sha256-D7s3ZsHQeGf+pYdbXvi5GMFqbkgajBuqTQwvjnjnrVo=", + "owner": "ram02z", + "repo": "tree-sitter-fish", + "rev": "a78aef9abc395c600c38a037ac779afc7e3cc9e0" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "mojo": { + "nurl": { + "args": { + "hash": "sha256-OhhAGOSO+oLazYjjLwqdPDJWC80KLMnCIJvmsJxyNN0=", + "owner": "lsh", + "repo": "tree-sitter-mojo", + "rev": "3d7c53b8038f9ebbb57cd2e61296180aa5c1cf64" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "janet-simple": { + "nurl": { + "args": { + "hash": "sha256-QXH/s0mB9kDKuYYB+Pa+nPjArt4pjcsLXCHP4I3nGwU=", + "owner": "sogaiu", + "repo": "tree-sitter-janet-simple", + "rev": "51271e260346878e1a1aa6c506ce6a797b7c25e2" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "json": { + "nurl": { + "args": { + "hash": "sha256-wbE7CQ6l1wlhJdAoDVAj1QzyvlYnevbrlVCO0TMU7to=", + "owner": "tree-sitter", + "repo": "tree-sitter-json", + "rev": "73076754005a460947cafe8e03a8cf5fa4fa2938" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "json5": { + "nurl": { + "args": { + "hash": "sha256-16gDgbPUyhSo3PJD9+zz6QLVd6G/W1afjyuCJbDUSIY=", + "owner": "Joakker", + "repo": "tree-sitter-json5", + "rev": "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "c": { + "nurl": { + "args": { + "hash": "sha256-G9kVqX8walvpI7gPvPzS8g7X8RVM9y5wJHGOcyjJA/A=", + "owner": "tree-sitter", + "repo": "tree-sitter-c", + "rev": "7175a6dd5fc1cee660dce6fe23f6043d75af424a" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "cpp": { + "nurl": { + "args": { + "hash": "sha256-yU1bwDhwcqeKrho0bo4qclqDDm1EuZWHENI2PNYnxVs=", + "owner": "tree-sitter", + "repo": "tree-sitter-cpp", + "rev": "56455f4245baf4ea4e0881c5169de69d7edd5ae7" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "crystal": { + "nurl": { + "args": { + "hash": "sha256-jZiy007NtbIoj7eVryejr1ECjzLErSzT1GXq24A9+xE=", + "owner": "crystal-lang-tools", + "repo": "tree-sitter-crystal", + "rev": "76afc1f53518a2b68b51a5abcde01d268a9cb47c" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "c-sharp": { + "nurl": { + "args": { + "hash": "sha256-ORhtfxQ6N72UjFx6WRfdYpkM9mVkTkxQ3PX3ydjIvX4=", + "owner": "tree-sitter", + "repo": "tree-sitter-c-sharp", + "rev": "b5eb5742f6a7e9438bee22ce8026d6b927be2cd7" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "cel": { + "nurl": { + "args": { + "hash": "sha256-ioorpQwPOVYAqjMaXqMaYcsYDGR2KHe4AB8uO5n3908=", + "owner": "bufbuild", + "repo": "tree-sitter-cel", + "rev": "9f2b65da14c216df53933748e489db0f11121464" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "spicedb": { + "nurl": { + "args": { + "hash": "sha256-dEpPkEohBB3qU1Vma/1VePkGGst4nA2RKgun7NiO2OA=", + "owner": "jzelinskie", + "repo": "tree-sitter-spicedb", + "rev": "a4e4645651f86d6684c15dfa9931b7841dc52a66" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "go": { + "nurl": { + "args": { + "hash": "sha256-38pkqR9iEIEf9r3IHJPIYgKfWBlb9aQWi1kij04Vo5k=", + "owner": "tree-sitter", + "repo": "tree-sitter-go", + "rev": "64457ea6b73ef5422ed1687178d4545c3e91334a" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "gomod": { + "nurl": { + "args": { + "hash": "sha256-KD6Fio9qie3wbGAvQaYsMdYOK1QjnRrGExt1oL/6mis=", + "owner": "camdencheek", + "repo": "tree-sitter-go-mod", + "rev": "6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "gotmpl": { + "nurl": { + "args": { + "hash": "sha256-YlPX74tEgCxGm2GYqYvQ0ouzTZ4x5/R+hkP+lBuOLGw=", + "owner": "dannylongeuay", + "repo": "tree-sitter-go-template", + "rev": "395a33e08e69f4155156f0b90138a6c86764c979" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "gowork": { + "nurl": { + "args": { + "hash": "sha256-C/taNah+rJJwCHTn41udtY5ZyhQgr3wQBGv4dTPR+c8=", + "owner": "omertuc", + "repo": "tree-sitter-go-work", + "rev": "6dd9dd79fb51e9f2abc829d5e97b15015b6a8ae2" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "javascript": { + "nurl": { + "args": { + "hash": "sha256-rfOAn5S8E2RunlRyY1aTs7j0r6UGKH+732xdpk/5524=", + "owner": "tree-sitter", + "repo": "tree-sitter-javascript", + "rev": "f772967f7b7bc7c28f845be2420a38472b16a8ee" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "typescript": { + "nurl": { + "args": { + "hash": "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ=", + "owner": "tree-sitter", + "repo": "tree-sitter-typescript", + "rev": "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": "typescript" + }, + "typespec": { + "nurl": { + "args": { + "hash": "sha256-qXA87soeEdlpzj8svEao8L0F5V14NSZc1WsX9z0PVB0=", + "owner": "happenslol", + "repo": "tree-sitter-typespec", + "rev": "0ee05546d73d8eb64635ed8125de6f35c77759fe" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "tsx": { + "nurl": { + "args": { + "hash": "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ=", + "owner": "tree-sitter", + "repo": "tree-sitter-typescript", + "rev": "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": "tsx" + }, + "css": { + "nurl": { + "args": { + "hash": "sha256-5Qti/bFac2A1PJxqZEOuSLK3GGKYwPDKAp3OOassBxU=", + "owner": "tree-sitter", + "repo": "tree-sitter-css", + "rev": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "scss": { + "nurl": { + "args": { + "hash": "sha256-BFtMT6eccBWUyq6b8UXRAbB1R1XD3CrrFf1DM3aUI5c=", + "owner": "serenadeai", + "repo": "tree-sitter-scss", + "rev": "c478c6868648eff49eb04a4df90d703dc45b312a" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "html": { + "nurl": { + "args": { + "hash": "sha256-lNMiSDAQ49QpeyD1RzkIIUeRWdp2Wrv6+XQZdZ40c1g=", + "owner": "tree-sitter", + "repo": "tree-sitter-html", + "rev": "cbb91a0ff3621245e890d1c50cc811bffb77a26b" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "htmldjango": { + "nurl": { + "args": { + "hash": "sha256-sQV7olTaQ68wixzvKV44myVvDUXXjBZh9N3jvDFUSvE=", + "owner": "interdependence", + "repo": "tree-sitter-htmldjango", + "rev": "3a643167ad9afac5d61e092f08ff5b054576fadf" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "python": { + "nurl": { + "args": { + "hash": "sha256-hXNxa895SyNOG7PH2vAIkWbcMjZDjWYDsCafBZuvnT0=", + "owner": "tree-sitter", + "repo": "tree-sitter-python", + "rev": "4bfdd9033a2225cc95032ce77066b7aeca9e2efc" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "nickel": { + "nurl": { + "args": { + "hash": "sha256-IvlUwNO/wLLPuqCZf0NtSxMdDx+4ASYYOobklY/97aQ=", + "owner": "nickel-lang", + "repo": "tree-sitter-nickel", + "rev": "88d836a24b3b11c8720874a1a9286b8ae838d30a" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "nix": { + "nurl": { + "args": { + "hash": "sha256-JaJRikijCXnKAuKA445IIDaRvPzGhLFM29KudaFsSVM=", + "owner": "nix-community", + "repo": "tree-sitter-nix", + "rev": "1b69cf1fa92366eefbe6863c184e5d2ece5f187d" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "ruby": { + "nurl": { + "args": { + "hash": "sha256-1kQ3RP2lJ0vwvVmKAQYNyPjltEKZLiZ4iI8iIxcRGd8=", + "owner": "tree-sitter", + "repo": "tree-sitter-ruby", + "rev": "206c7077164372c596ffa8eaadb9435c28941364" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "bash": { + "nurl": { + "args": { + "hash": "sha256-7N1PLVMJxwN5FzHW9NbXZTzGhvziwLCC8tDO3qdjtOo=", + "owner": "tree-sitter", + "repo": "tree-sitter-bash", + "rev": "487734f87fd87118028a65a4599352fa99c9cde8" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "php": { + "nurl": { + "args": { + "hash": "sha256-j4RJUBbp2zvCHsZwnz62t2Tf6Cy1LOKrhg/pi8cqzAs=", + "owner": "tree-sitter", + "repo": "tree-sitter-php", + "rev": "f860e598194f4a71747f91789bf536b393ad4a56" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "php-only": { + "nurl": { + "args": { + "hash": "sha256-b45+2ev0pArt/TmtRVb5BbE+ouNjDFVT7NO0qSbtrtM=", + "owner": "tree-sitter", + "repo": "tree-sitter-php", + "rev": "cf1f4a0f1c01c705c1d6cf992b104028d5df0b53" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": "php_only" + }, + "blade": { + "nurl": { + "args": { + "hash": "sha256-AACW+dz5M5gGKNri8tI+58tvWtjmQl6iImyAFqtOkL8=", + "owner": "EmranMR", + "repo": "tree-sitter-blade", + "rev": "4c66efe1e05c639c555ee70092021b8223d2f440" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "twig": { + "nurl": { + "args": { + "hash": "sha256-87jFYAAnblTeEdlXqTjyiiNee/OgasPam1b2xyKQIHY=", + "owner": "gbprod", + "repo": "tree-sitter-twig", + "rev": "085648e01d1422163a1702a44e72303b4e2a0bd1" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "latex": { + "nurl": { + "args": { + "hash": "sha256-zkp4De2eBoOsPZRHHT3mIPVWFPYboTvn6AQ4AkwXhFE=", + "owner": "latex-lsp", + "repo": "tree-sitter-latex", + "rev": "8c75e93cd08ccb7ce1ccab22c1fbd6360e3bcea6" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "bibtex": { + "nurl": { + "args": { + "hash": "sha256-wgduSxlpbJy/ITenBLfj5lhziUM1BApX6MjXhWcb7lQ=", + "owner": "latex-lsp", + "repo": "tree-sitter-bibtex", + "rev": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "lean": { + "nurl": { + "args": { + "hash": "sha256-U4ObSk4mtpp/gq8fnDQOKFfrgZ8/SuF6v5UhqxyAhWk=", + "owner": "Julian", + "repo": "tree-sitter-lean", + "rev": "d98426109258b266e1e92358c5f11716d2e8f638" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "lpf": { + "nurl": { + "args": { + "hash": "sha256-Y+W4Ceb0+gUJbBC9ziy672not6zc8JVIGTWYsPmWk7c=", + "owner": "TheZoq2", + "repo": "tree-sitter-lpf", + "rev": "db7372e60c722ca7f12ab359e57e6bf7611ab126" + }, + "fetcher": "fetchFromGitLab" + }, + "subpath": null + }, + "julia": { + "nurl": { + "args": { + "hash": "sha256-jrQjVPLb6SfePxEJV1GgFgLslGxgdmdb8bJy6VHOEbs=", + "owner": "tree-sitter", + "repo": "tree-sitter-julia", + "rev": "e84f10db8eeb8b9807786bfc658808edaa1b4fa2" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "java": { + "nurl": { + "args": { + "hash": "sha256-tGBi6gJJIPpp6oOwmAQdqBD6eaJRBRcYbWtm1BHsgBA=", + "owner": "tree-sitter", + "repo": "tree-sitter-java", + "rev": "09d650def6cdf7f479f4b78f595e9ef5b58ce31e" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "smali": { + "nurl": { + "args": { + "hash": "sha256-hcqai2QKx6ZG+Sl1HOPu3wlyjKt3MJ60jNfjfcjKKiM=", + "owner": "amaanq", + "repo": "tree-sitter-smali", + "rev": "5ae51e15c4d1ac93cba6127caf3d1f0a072c140c" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "ledger": { + "nurl": { + "args": { + "hash": "sha256-bZcEeTv37CvSUa0geSlFX3La3flBi2awbU1RC0hTreM=", + "owner": "cbarrete", + "repo": "tree-sitter-ledger", + "rev": "1f864fb2bf6a87fe1b48545cc6adc6d23090adf7" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "beancount": { + "nurl": { + "args": { + "hash": "sha256-WtZ3FindaePKbtlnilK9KkOoPxBaxRKNVM+8D52DtBE=", + "owner": "polarmutex", + "repo": "tree-sitter-beancount", + "rev": "f3741a3a68ade59ec894ed84a64673494d2ba8f3" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "ocaml": { + "nurl": { + "args": { + "hash": "sha256-9Y/eZNsKkz8RKjMn5RIAPITkDQTWdSc/fBXzxMg1ViQ=", + "owner": "tree-sitter", + "repo": "tree-sitter-ocaml", + "rev": "9965d208337d88bbf1a38ad0b0fe49e5f5ec9677" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": "ocaml" + }, + "ocaml-interface": { + "nurl": { + "args": { + "hash": "sha256-9Y/eZNsKkz8RKjMn5RIAPITkDQTWdSc/fBXzxMg1ViQ=", + "owner": "tree-sitter", + "repo": "tree-sitter-ocaml", + "rev": "9965d208337d88bbf1a38ad0b0fe49e5f5ec9677" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": "interface" + }, + "lua": { + "nurl": { + "args": { + "hash": "sha256-w+WVQHPiS/xyRz0obdJoUHZ7QzIDAvgtSzmE98yDORY=", + "owner": "tree-sitter-grammars", + "repo": "tree-sitter-lua", + "rev": "88e446476a1e97a8724dff7a23e2d709855077f2" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "teal": { + "nurl": { + "args": { + "hash": "sha256-9RX7QMrG8+EZQ5yeYGeAGxRz8wqPP6p1GcSyDY4OvlY=", + "owner": "euclidianAce", + "repo": "tree-sitter-teal", + "rev": "3db655924b2ff1c54fdf6371b5425ea6b5dccefe" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "svelte": { + "nurl": { + "args": { + "hash": "sha256-ZXEg3HLE9hTEK/7eYRQzn7Rtyk0ETooW/h0ghBKdVhI=", + "owner": "Himujjal", + "repo": "tree-sitter-svelte", + "rev": "60ea1d673a1a3eeeb597e098d9ada9ed0c79ef4b" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "vue": { + "nurl": { + "args": { + "hash": "sha256-NeuNpMsKZUP5mrLCjJEOSLD6tlJpNO4Z/rFUqZLHE1A=", + "owner": "ikatyang", + "repo": "tree-sitter-vue", + "rev": "91fe2754796cd8fba5f229505a23fa08f3546c06" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "yaml": { + "nurl": { + "args": { + "hash": "sha256-bpiT3FraOZhJaoiFWAoVJX1O+plnIi8aXOW2LwyU23M=", + "owner": "ikatyang", + "repo": "tree-sitter-yaml", + "rev": "0e36bed171768908f331ff7dff9d956bae016efb" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "haskell": { + "nurl": { + "args": { + "hash": "sha256-0wmdbXHZbHkv4pTrB1fCbExx9E83l+zaocGa+SvQsZQ=", + "owner": "tree-sitter", + "repo": "tree-sitter-haskell", + "rev": "0975ef72fc3c47b530309ca93937d7d143523628" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "haskell-persistent": { + "nurl": { + "args": { + "hash": "sha256-p4Anm/xeG/d7nYBPDABcdDih/a+0rMjwtVUJru7m9QY=", + "owner": "MercuryTechnologies", + "repo": "tree-sitter-haskell-persistent", + "rev": "58a6ccfd56d9f1de8fb9f77e6c42151f8f0d0f3d" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "purescript": { + "nurl": { + "args": { + "hash": "sha256-tONS2Eai/eVDecn6ow4nN9F7++UjY6OAKezeCco8hYU=", + "owner": "postsolar", + "repo": "tree-sitter-purescript", + "rev": "f541f95ffd6852fbbe88636317c613285bc105af" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "zig": { + "nurl": { + "args": { + "hash": "sha256-iyb79SiMsV94RrWH/1Oi2aKBiX5io0Dp+zZf8qWZHwg=", + "owner": "tree-sitter-grammars", + "repo": "tree-sitter-zig", + "rev": "eb7d58c2dc4fbeea4745019dee8df013034ae66b" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "prolog": { + "nurl": { + "args": { + "domain": "codeberg.org", + "hash": "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18=", + "owner": "foxy", + "repo": "tree-sitter-prolog", + "rev": "d8d415f6a1cf80ca138524bcc395810b176d40fa" + }, + "fetcher": "fetchFromGitea" + }, + "subpath": "grammars/prolog" + }, + "query": { + "nurl": { + "args": { + "hash": "sha256-xtr2IVI+3h/u9f84ye7szHR/U2E8Bm5NN7vhqaCkiyI=", + "owner": "tree-sitter-grammars", + "repo": "tree-sitter-query", + "rev": "a6674e279b14958625d7a530cabe06119c7a1532" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "cmake": { + "nurl": { + "args": { + "hash": "sha256-2xJaDgrCJQ2obGYvhsHk2/2p8lFNwuScjbjdxJihh5I=", + "owner": "uyha", + "repo": "tree-sitter-cmake", + "rev": "6e51463ef3052dd3b328322c22172eda093727ad" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "make": { + "nurl": { + "args": { + "hash": "sha256-qQqapnKKH5X8rkxbZG5PjnyxvnpyZHpFVi/CLkIn/x0=", + "owner": "alemuller", + "repo": "tree-sitter-make", + "rev": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "glsl": { + "nurl": { + "args": { + "hash": "sha256-jQrBz7dDVn9p4et1Oe034YYBRXzi+hdSkqyi3TsQUv8=", + "owner": "theHamsta", + "repo": "tree-sitter-glsl", + "rev": "88408ffc5e27abcffced7010fc77396ae3636d7e" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "perl": { + "nurl": { + "args": { + "hash": "sha256-/WA3E5kDxHl3YJ5yd020iIVc1YEssAcvlD5/Voceu2Y=", + "owner": "tree-sitter-perl", + "repo": "tree-sitter-perl", + "rev": "72a08a496a23212f23802490ef6f4700d68cfd0e" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "pod": { + "nurl": { + "args": { + "hash": "sha256-yV2kVAxWxdyIJ3g2oivDc01SAQF0lc7UMT2sfv9lKzI=", + "owner": "tree-sitter-perl", + "repo": "tree-sitter-pod", + "rev": "0bf8387987c21bf2f8ed41d2575a8f22b139687f" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "comment": { + "nurl": { + "args": { + "hash": "sha256-ihkBqdYVulTlysb9J8yg4c5XVktJw8jIwzhqybBw8Ug=", + "owner": "stsewd", + "repo": "tree-sitter-comment", + "rev": "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "wesl": { + "nurl": { + "args": { + "hash": "sha256-n9yob5tDyWalSAPjH2a3BFcH4Zqd6rwb+V/Qbvaxt7c=", + "owner": "wgsl-tooling-wg", + "repo": "tree-sitter-wesl", + "rev": "94ee6122680ef8ce2173853ca7c99f7aaeeda8ce" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "wgsl": { + "nurl": { + "args": { + "hash": "sha256-x42qHPwzv3uXVahHE9xYy3RkrYFctJGNEJmu6w1/2Qo=", + "owner": "szebniok", + "repo": "tree-sitter-wgsl", + "rev": "272e89ef2aeac74178edb9db4a83c1ffef80a463" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "llvm": { + "nurl": { + "args": { + "hash": "sha256-L3XwPhvwIR/mUbugMbaHS9dXyhO7bApv/gdlxQ+2Bbo=", + "owner": "benwilliamgraham", + "repo": "tree-sitter-llvm", + "rev": "c14cb839003348692158b845db9edda201374548" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "llvm-mir": { + "nurl": { + "args": { + "hash": "sha256-ivslvFNr3550Grko9xbHPtA63XNc+twFfZQFhBmPaME=", + "owner": "Flakebi", + "repo": "tree-sitter-llvm-mir", + "rev": "d166ff8c5950f80b0a476956e7a0ad2f27c12505" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "tablegen": { + "nurl": { + "args": { + "hash": "sha256-8yn/Czv/aNQfa/k8gnr8qeCsuDtU2L2qHGKAMbv8Vgk=", + "owner": "Flakebi", + "repo": "tree-sitter-tablegen", + "rev": "3e9c4822ab5cdcccf4f8aa9dcd42117f736d51d9" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "mail": { + "nurl": { + "args": { + "hash": "sha256-qdqswVQeThHDQahUr1HNF/TIP+1X0eMWch1SfBvXQA0=", + "owner": "ficcdaf", + "repo": "tree-sitter-mail", + "rev": "8e60f38efbae1cc5f22833ae13c5500dd0f3b12f" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "markdown": { + "nurl": { + "args": { + "hash": "sha256-1/Uo8Bk7QPiQqAWL9jgYLtq6JNj1dnNDBSHn15FHlCM=", + "owner": "tree-sitter-grammars", + "repo": "tree-sitter-markdown", + "rev": "62516e8c78380e3b51d5b55727995d2c511436d8" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": "tree-sitter-markdown" + }, + "markdown-inline": { + "nurl": { + "args": { + "hash": "sha256-1/Uo8Bk7QPiQqAWL9jgYLtq6JNj1dnNDBSHn15FHlCM=", + "owner": "tree-sitter-grammars", + "repo": "tree-sitter-markdown", + "rev": "62516e8c78380e3b51d5b55727995d2c511436d8" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": "tree-sitter-markdown-inline" + }, + "djot": { + "nurl": { + "args": { + "hash": "sha256-Mp2y2YaaSPptZnc84GKiMQh4gHrJofm7SgPOMwYRx7w=", + "owner": "treeman", + "repo": "tree-sitter-djot", + "rev": "67e6e23ba7be81a4373e0f49e21207bdc32d12a5" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "dart": { + "nurl": { + "args": { + "hash": "sha256-+DFqJFR5raOnNG1oyGfO+tzpBXYBk0BBc8GbEkpEBhU=", + "owner": "UserNobody14", + "repo": "tree-sitter-dart", + "rev": "e398400a0b785af3cf571f5a57eccab242f0cdf9" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "scala": { + "nurl": { + "args": { + "hash": "sha256-2gIB5b//ONJrYe0rtBKYc/qyDuIuzob61bRa3oAN0Jw=", + "owner": "tree-sitter", + "repo": "tree-sitter-scala", + "rev": "7891815f42dca9ed6aeb464c2edc39d479ab965c" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "dockerfile": { + "nurl": { + "args": { + "hash": "sha256-uDRDq6MYYV8nh6FDsQN3tdyZywEg8A224bfWrgFGvFs=", + "owner": "camdencheek", + "repo": "tree-sitter-dockerfile", + "rev": "087daa20438a6cc01fa5e6fe6906d77c869d19fe" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "gitcommit": { + "nurl": { + "args": { + "hash": "sha256-KYfcs99p03b0RiPYnZeKJf677fmVf658FLZcFk2v2Ws=", + "owner": "gbprod", + "repo": "tree-sitter-gitcommit", + "rev": "a716678c0f00645fed1e6f1d0eb221481dbd6f6d" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "diff": { + "nurl": { + "args": { + "hash": "sha256-Lm+3jsje1sCDXMFq2Hw+5M5Q6/zLOW1INtOfYoZsalE=", + "owner": "the-mikedavis", + "repo": "tree-sitter-diff", + "rev": "fd74c78fa88a20085dbc7bbeaba066f4d1692b63" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "git-rebase": { + "nurl": { + "args": { + "hash": "sha256-mbRu2+wZVf5Nk3XlFvLSBOUg2QqmCR2tqO7gLpOJ45k=", + "owner": "the-mikedavis", + "repo": "tree-sitter-git-rebase", + "rev": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "regex": { + "nurl": { + "args": { + "hash": "sha256-lDsr3sLrLf6wXu/juIA+bTtv1SBo+Jgwqw/6yBAE0kg=", + "owner": "tree-sitter", + "repo": "tree-sitter-regex", + "rev": "e1cfca3c79896ff79842f057ea13e529b66af636" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "git-config": { + "nurl": { + "args": { + "hash": "sha256-O0w0BhhPPwhnKfniAFSPMWfBsZUTrijifAsmFiAncWg=", + "owner": "the-mikedavis", + "repo": "tree-sitter-git-config", + "rev": "9c2a1b7894e6d9eedfe99805b829b4ecd871375e" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "gitattributes": { + "nurl": { + "args": { + "hash": "sha256-JOE+ezW6WrwVAtOTz4jnhhPDP3cbQBF38SeweTMMscU=", + "owner": "mtoohey31", + "repo": "tree-sitter-gitattributes", + "rev": "3dd50808e3096f93dccd5e9dc7dc3dba2eb12dc4" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "gitignore": { + "nurl": { + "args": { + "hash": "sha256-MjoY1tlVZgN6JqoTjhhg0zSdHzc8yplMr8824sfIKp8=", + "owner": "shunsambongi", + "repo": "tree-sitter-gitignore", + "rev": "f4685bf11ac466dd278449bcfe5fd014e94aa504" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "graphql": { + "nurl": { + "args": { + "hash": "sha256-NvE9Rpdp4sALqKSRWJpqxwl6obmqnIIdvrL1nK5peXc=", + "owner": "bkegley", + "repo": "tree-sitter-graphql", + "rev": "5e66e961eee421786bdda8495ed1db045e06b5fe" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "elm": { + "nurl": { + "args": { + "hash": "sha256-PhAHrFFbfeUl5+O8JSTqx8O0Bx+XRoJ0EvTwYrYnNJI=", + "owner": "elm-tooling", + "repo": "tree-sitter-elm", + "rev": "df4cb639c01b76bc9ac9cc66788709a6da20002c" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "iex": { + "nurl": { + "args": { + "hash": "sha256-YRVxMz9VqZ00bG0tQ/IDxf/8UkK3/OYZTIMxsQfknII=", + "owner": "elixir-lang", + "repo": "tree-sitter-iex", + "rev": "39f20bb51f502e32058684e893c0c0b00bb2332c" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "rescript": { + "nurl": { + "args": { + "hash": "sha256-DTO+AMzjq/+n4zJNkTyjiiIlvAo8NlDQ7gbwrFYt0Os=", + "owner": "rescript-lang", + "repo": "tree-sitter-rescript", + "rev": "5e2a44a9d886b0a509f5bfd0437d33b4871fbac5" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "erlang": { + "nurl": { + "args": { + "hash": "sha256-5fF0ZAOzq3j6aqv2t8u9dfUtu1YuycSono1nkz9/GgA=", + "owner": "the-mikedavis", + "repo": "tree-sitter-erlang", + "rev": "33a3e4f1fa77a3e1a2736813f4b27c358f6c0b63" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "kotlin": { + "nurl": { + "args": { + "hash": "sha256-7REd272fpCP/ggzg7wLf5DS6QX9SIO9YGPdvj2c2w58=", + "owner": "fwcd", + "repo": "tree-sitter-kotlin", + "rev": "c4ddea359a7ff4d92360b2efcd6cfce5dc25afe6" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "hcl": { + "nurl": { + "args": { + "hash": "sha256-HM77BXavgP+H3XwHSqRdLlylmkH+idtuZqLeOV2VUiM=", + "owner": "tree-sitter-grammars", + "repo": "tree-sitter-hcl", + "rev": "9e3ec9848f28d26845ba300fd73c740459b83e9b" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "org": { + "nurl": { + "args": { + "hash": "sha256-hj71GKIScfHFVDjXzJ2waBJDFU1dDVduOXxMxKdYvyk=", + "owner": "milisims", + "repo": "tree-sitter-org", + "rev": "698bb1a34331e68f83fc24bdd1b6f97016bb30de" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "solidity": { + "nurl": { + "args": { + "hash": "sha256-Tt8lXaHrRFbbATUoWK+Y9FZohY1IeDTCXaaom4yZYb4=", + "owner": "JoranHonig", + "repo": "tree-sitter-solidity", + "rev": "f7f5251a3f5b1d04f0799b3571b12918af177fc8" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "gleam": { + "nurl": { + "args": { + "hash": "sha256-SZ2LX068EaDXTtit+GQ7oxS7rDuVnFtCurp18/hMCcQ=", + "owner": "gleam-lang", + "repo": "tree-sitter-gleam", + "rev": "ee93c639dc82148d716919df336ad612fd33538e" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "ron": { + "nurl": { + "args": { + "hash": "sha256-Sp0g6AWKHNjyUmL5k3RIU+5KtfICfg3o/DH77XRRyI0=", + "owner": "tree-sitter-grammars", + "repo": "tree-sitter-ron", + "rev": "78938553b93075e638035f624973083451b29055" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "robot": { + "nurl": { + "args": { + "hash": "sha256-VxWZWFPYkD3odM3TpEgLKsFnN8wB6xoIiXUYqBbpDqw=", + "owner": "Hubro", + "repo": "tree-sitter-robot", + "rev": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "r": { + "nurl": { + "args": { + "hash": "sha256-R9Uu7okB6WrxQlgsHN39sCSG8DiSXvo2Jwu+8SwOuCk=", + "owner": "r-lib", + "repo": "tree-sitter-r", + "rev": "cc04302e1bff76fa02e129f332f44636813b0c3c" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "swift": { + "nurl": { + "args": { + "hash": "sha256-FvNn+FHY9YumfE4taqoORzdu8TRn6Cc3DgRpyjzN6aM=", + "owner": "alex-pinkus", + "repo": "tree-sitter-swift", + "rev": "57c1c6d6ffa1c44b330182d41717e6fe37430704" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "embedded-template": { + "nurl": { + "args": { + "hash": "sha256-fbzYXLIxaBM/lZTTZ7Wad+Yrb3q3mCW6j1mE8p2RdkA=", + "owner": "tree-sitter", + "repo": "tree-sitter-embedded-template", + "rev": "d21df11b0ecc6fd211dbe11278e92ef67bd17e97" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "eex": { + "nurl": { + "args": { + "hash": "sha256-UPq62MkfGFh9m/UskoB9uBDIYOcotITCJXDyrbg/wKY=", + "owner": "connorlay", + "repo": "tree-sitter-eex", + "rev": "f742f2fe327463335e8671a87c0b9b396905d1d1" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "heex": { + "nurl": { + "args": { + "hash": "sha256-B9kNSHH/FhBdeAnXPUxiZAZK9efJpqo0MnuR9nfLlLU=", + "owner": "phoenixframework", + "repo": "tree-sitter-heex", + "rev": "f6b83f305a755cd49cf5f6a66b2b789be93dc7b9" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "sql": { + "nurl": { + "args": { + "hash": "sha256-uEiwHIlLC6AyqD3/fH9KmXMdgQUb30MwBGrjPoyAPbc=", + "owner": "DerekStride", + "repo": "tree-sitter-sql", + "rev": "b9d109588d5b5ed986c857464830c2f0bef53f18" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "gdscript": { + "nurl": { + "args": { + "hash": "sha256-HikAZVoOqKRNnEBv/CCqqyt94HbXg2dBq+4GsmUFSIA=", + "owner": "PrestonKnopp", + "repo": "tree-sitter-gdscript", + "rev": "1f1e782fe2600f50ae57b53876505b8282388d77" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "godot-resource": { + "nurl": { + "args": { + "hash": "sha256-wdxCfG48fzswUg4q2pgI4q7jK7ZimpKo4+dRnZsZJ6U=", + "owner": "PrestonKnopp", + "repo": "tree-sitter-godot-resource", + "rev": "2ffb90de47417018651fc3b970e5f6b67214dc9d" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "nu": { + "nurl": { + "args": { + "hash": "sha256-DH0w2QdEqJskvhXlBf0sJeYReuHfiI/mFHUPE9p+Ie8=", + "owner": "nushell", + "repo": "tree-sitter-nu", + "rev": "358c4f509eb97f0148bbd25ad36acc729819b9c1" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "vala": { + "nurl": { + "args": { + "hash": "sha256-EpzG7PH9xoZdzvzZcuI1cQ6ukPlxXc2YRXPawpD8+nc=", + "owner": "vala-lang", + "repo": "tree-sitter-vala", + "rev": "c9eea93ba2ec4ec1485392db11945819779745b3" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "hare": { + "nurl": { + "args": { + "hash": "sha256-mONAnzm2YLeTvefeeRfrBVeaPhv/qnepZRIw9n0CUfI=", + "owner": "~ecs", + "repo": "tree-sitter-hare", + "rev": "07035a248943575444aa0b893ffe306e1444c0ab" + }, + "fetcher": "fetchFromSourcehut" + }, + "subpath": null + }, + "devicetree": { + "nurl": { + "args": { + "hash": "sha256-NEuQy+Ad9UQE0JeWkyixKC6K7j5DrSpUJ6X50Im6R7c=", + "owner": "joelspadin", + "repo": "tree-sitter-devicetree", + "rev": "877adbfa0174d25894c40fa75ad52d4515a36368" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "cairo": { + "nurl": { + "args": { + "hash": "sha256-Ikn8KE5OflDl3x7uCTrkHTaKXZ2J09mInOyg9f5wRKo=", + "owner": "starkware-libs", + "repo": "tree-sitter-cairo", + "rev": "4c6a25680546761b80a710ead1dd34e76c203125" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "cpon": { + "nurl": { + "args": { + "hash": "sha256-pnQ5pUDlpMJot7w2OQkXsYOzSAuiygFITPeGJ6VrKKs=", + "owner": "fvacek", + "repo": "tree-sitter-cpon", + "rev": "0d01fcdae5a53191df5b1349f9bce053833270e7" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "odin": { + "nurl": { + "args": { + "hash": "sha256-Pv/X6xgJeVjgIuBXIgZT4/vVrytnl1mMiKjMMjH/qQo=", + "owner": "tree-sitter-grammars", + "repo": "tree-sitter-odin", + "rev": "6c6b07e354a52f8f2a9bc776cbc262a74e74fd26" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "meson": { + "nurl": { + "args": { + "hash": "sha256-iSnkmgNax7U51Ng5WC0iTKJ6UyYmakvijUPtFmFgMzw=", + "owner": "staysail", + "repo": "tree-sitter-meson", + "rev": "32a83e8f200c347232fa795636cfe60dde22957a" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "sshclientconfig": { + "nurl": { + "args": { + "hash": "sha256-Ujl/3Ti/W6SBft1l4g8FsDEyLGSyLzFPzE/8pn37e70=", + "owner": "metio", + "repo": "tree-sitter-ssh-client-config", + "rev": "e45c6d5c71657344d4ecaf87dafae7736f776c57" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "scheme": { + "nurl": { + "args": { + "hash": "sha256-s9AoMNYnKvzr969aujgwUaVn4WoRaZ5snfFEF73KUGA=", + "owner": "6cdh", + "repo": "tree-sitter-scheme", + "rev": "af3af6c9356b936f8a515a1e449c32e804c2b1a8" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "v": { + "nurl": { + "args": { + "hash": "sha256-I6+4CRwLNFwozNRNE5+cbrOX8hBroCh90H2V7qo2gIo=", + "owner": "vlang", + "repo": "v-analyzer", + "rev": "59a8889d84a293d7c0366d14c8dbb0eec24fe889" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": "tree_sitter_v" + }, + "verilog": { + "nurl": { + "args": { + "hash": "sha256-l4DgThuP9EFU55YQ9lgvVP/8pXojOllQ870gRsBF3FE=", + "owner": "tree-sitter", + "repo": "tree-sitter-verilog", + "rev": "4457145e795b363f072463e697dfe2f6973c9a52" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "edoc": { + "nurl": { + "args": { + "hash": "sha256-ALGr1vI/R2gAgjHfwORYMP/+CeIejnSGqC9Db+GD5uM=", + "owner": "the-mikedavis", + "repo": "tree-sitter-edoc", + "rev": "74774af7b45dd9cefbf9510328fc6ff2374afc50" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "jsdoc": { + "nurl": { + "args": { + "hash": "sha256-Zhl9mEpJE9Qy3MVScE2JK4i8OFZUXl5KMhKMS4bw+mI=", + "owner": "tree-sitter", + "repo": "tree-sitter-jsdoc", + "rev": "189a6a4829beb9cdbe837260653b4a3dfb0cc3db" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "openscad": { + "nurl": { + "args": { + "hash": "sha256-4rCKvF3UewZEUZOcEIcTRm79//2vCO33BTi2gLGnlFQ=", + "owner": "openscad", + "repo": "tree-sitter-openscad", + "rev": "acc196e969a169cadd8b7f8d9f81ff2d30e3e253" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "prisma": { + "nurl": { + "args": { + "hash": "sha256-MOqkM7DCQl1L8Jn9nyw89EoAr0ez4+d39HeKy2cb66c=", + "owner": "victorhqc", + "repo": "tree-sitter-prisma", + "rev": "eca2596a355b1a9952b4f80f8f9caed300a272b5" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "clojure": { + "nurl": { + "args": { + "hash": "sha256-tr1DJWqX5cXvWnA5D8M0Pqp1UM36EYnHdus/oMnOCEM=", + "owner": "sogaiu", + "repo": "tree-sitter-clojure", + "rev": "e57c569ae332ca365da623712ae1f50f84daeae2" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "elvish": { + "nurl": { + "args": { + "hash": "sha256-N+z+KJqSycClyPm85YR0NolHc96KbmsifZSYOzCuifc=", + "owner": "ckafi", + "repo": "tree-sitter-elvish", + "rev": "e50787cadd3bc54f6d9c0704493a79078bb8a4e5" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "fortran": { + "nurl": { + "args": { + "hash": "sha256-ylQLalRFqRu5N/lUxvwOds/UbLH2JJ7T/rOpo9H4MZ4=", + "owner": "stadelmanma", + "repo": "tree-sitter-fortran", + "rev": "f0f2f100952a353e64e26b0fa710b4c296d7af13" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "ungrammar": { + "nurl": { + "args": { + "hash": "sha256-cNBijko9v2BidDKlMFK4ivvd0xjmFL/SVZYJw+H0vyI=", + "owner": "Philipp-M", + "repo": "tree-sitter-ungrammar", + "rev": "a7e104629cff5a8b7367187610631e8f5eb7c6ea" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "dot": { + "nurl": { + "args": { + "hash": "sha256-wk4mmbPD+kxH5RsVB1tGtx9lB+jAXtpXrhTGZsJeWeA=", + "owner": "rydesun", + "repo": "tree-sitter-dot", + "rev": "917230743aa10f45a408fea2ddb54bbbf5fbe7b7" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "cue": { + "nurl": { + "args": { + "hash": "sha256-uV7Tl41PCU+8uJa693km5xvysvbptbT7LvGyYIelspk=", + "owner": "eonpatapon", + "repo": "tree-sitter-cue", + "rev": "8a5f273bfa281c66354da562f2307c2d394b6c81" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "slang": { + "nurl": { + "args": { + "hash": "sha256-Oj3Z1Zw1geM2jid7xg0041cYtStV+CRl7anXbIIGE5c=", + "owner": "tree-sitter-grammars", + "repo": "tree-sitter-slang", + "rev": "327b1b821c255867a4fb724c8eee48887e3d014b" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "slint": { + "nurl": { + "args": { + "hash": "sha256-NTxJwVYq3o+9+BbBi4Lcj++mB4hvKAN3N+dRadXuBNo=", + "owner": "slint-ui", + "repo": "tree-sitter-slint", + "rev": "f11da7e62051ba8b9d4faa299c26de8aeedfc1cd" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "task": { + "nurl": { + "args": { + "hash": "sha256-zBEAROWfH6+G2sCBIN/F83byfq8dKCecokIqazQ74n0=", + "owner": "alexanderbrevig", + "repo": "tree-sitter-task", + "rev": "f2cb435c5dbf3ee19493e224485d977cb2d36d8b" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "xit": { + "nurl": { + "args": { + "hash": "sha256-hw/EHIYY620doxWTzd+dMf/umLAr1iHmEQWtlR+6Q1I=", + "owner": "synaptiko", + "repo": "tree-sitter-xit", + "rev": "7d7902456061bc2ad21c64c44054f67b5515734c" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "esdl": { + "nurl": { + "args": { + "hash": "sha256-+suOuc6dvo7N8zIQfChPUUUQKmaV6e4YEch0ypKMAtw=", + "owner": "greym0uth", + "repo": "tree-sitter-esdl", + "rev": "df83acc8cacd0cfb139eecee0e718dc32c4f92e2" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "pascal": { + "nurl": { + "args": { + "hash": "sha256-/nChZspacQymw+1P7yrkOpa7BIBVIKeLKUv0y9Hk8oc=", + "owner": "Isopod", + "repo": "tree-sitter-pascal", + "rev": "2fd40f477d3e2794af152618ccfac8d92eb72a66" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "sml": { + "nurl": { + "args": { + "hash": "sha256-fOn9ijHtouLncw4r7ohUa3HLt+4WxY884mKDzM7yoHs=", + "owner": "Giorbo", + "repo": "tree-sitter-sml", + "rev": "bd4055d5554614520d4a0706b34dc0c317c6b608" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "jsonnet": { + "nurl": { + "args": { + "hash": "sha256-7LdIA+tsFUIvAk9GoqJwSU5tJDNPtsziv0rbiiLmCLY=", + "owner": "sourcegraph", + "repo": "tree-sitter-jsonnet", + "rev": "0475a5017ad7dc84845d1d33187f2321abcb261d" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "ada": { + "nurl": { + "args": { + "hash": "sha256-30yCHcO9LdZ9VKQpObWRfk49M5tC85IZvutXgzGwTjQ=", + "owner": "briot", + "repo": "tree-sitter-ada", + "rev": "ba0894efa03beb70780156b91e28c716b7a4764d" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "astro": { + "nurl": { + "args": { + "hash": "sha256-q1ni++SPbq5y+47fPb6TryMw86gpULwNcXwi5yjXCWI=", + "owner": "virchau13", + "repo": "tree-sitter-astro", + "rev": "947e93089e60c66e681eba22283f4037841451e7" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "bass": { + "nurl": { + "args": { + "hash": "sha256-AmrzHntk8FLw8qtJAVvOzFuBA7H3wURTnx+PsrIp+pM=", + "owner": "vito", + "repo": "tree-sitter-bass", + "rev": "501133e260d768ed4e1fd7374912ed5c86d6fd90" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "wat": { + "nurl": { + "args": { + "hash": "sha256-a1l4RsGpRQfUxEjwewyKiV0G7J2DHZW6+y1HnjREYAs=", + "owner": "wasm-lsp", + "repo": "tree-sitter-wasm", + "rev": "2ca28a9f9d709847bf7a3de0942a84e912f59088" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": "wat" + }, + "wast": { + "nurl": { + "args": { + "hash": "sha256-a1l4RsGpRQfUxEjwewyKiV0G7J2DHZW6+y1HnjREYAs=", + "owner": "wasm-lsp", + "repo": "tree-sitter-wasm", + "rev": "2ca28a9f9d709847bf7a3de0942a84e912f59088" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": "wast" + }, + "d": { + "nurl": { + "args": { + "hash": "sha256-gbKg/EARBg7qGU8NeczUXxBNAK20c8aEvmwwNEkebs4=", + "owner": "gdamore", + "repo": "tree-sitter-d", + "rev": "5566f8ce8fc24186fad06170bbb3c8d97c935d74" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "vhs": { + "nurl": { + "args": { + "hash": "sha256-Qf4Y1I/X5xGVZ4u2ud+XdC2dL+0sjR+0pJRJ8SUraiQ=", + "owner": "charmbracelet", + "repo": "tree-sitter-vhs", + "rev": "9534865e614c95eb9418e5e73f061c32fa4d9540" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "kdl": { + "nurl": { + "args": { + "hash": "sha256-+oJqfbBDbrNS7E+x/QCX9m6FVf0NLw4qWH9n54joJYA=", + "owner": "amaanq", + "repo": "tree-sitter-kdl", + "rev": "3ca569b9f9af43593c24f9e7a21f02f43a13bb88" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "xml": { + "nurl": { + "args": { + "hash": "sha256-8c/XtnffylxiqX3Q7VFWlrk/655FG2pwqYrftGpnVxI=", + "owner": "RenjiSann", + "repo": "tree-sitter-xml", + "rev": "48a7c2b6fb9d515577e115e6788937e837815651" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "dtd": { + "nurl": { + "args": { + "hash": "sha256-mq617pfH/Na9JB8SDEudxbKJfaoezgjC3xVOIOZ8Qb8=", + "owner": "KMikeeU", + "repo": "tree-sitter-dtd", + "rev": "6116becb02a6b8e9588ef73d300a9ba4622e156f" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "wit": { + "nurl": { + "args": { + "hash": "sha256-5+cw9vWPizK7YlEhiNJheYVYOgtheEifd4g1KF5ldyE=", + "owner": "hh9527", + "repo": "tree-sitter-wit", + "rev": "c917790ab9aec50c5fd664cbfad8dd45110cfff3" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "ini": { + "nurl": { + "args": { + "hash": "sha256-kWCaOIC81GP5EHCqzPZP9EUgYy39CZ6/8TVS6soB6Wo=", + "owner": "justinmk", + "repo": "tree-sitter-ini", + "rev": "32b31863f222bf22eb43b07d4e9be8017e36fb31" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "inko": { + "nurl": { + "args": { + "hash": "sha256-NlmfN83UOJW5z8IGCEVfDnhZBUG04oA6/5O7aJckqdI=", + "owner": "inko-lang", + "repo": "tree-sitter-inko", + "rev": "7860637ce1b43f5f79cfb7cc3311bf3234e9479f" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "bicep": { + "nurl": { + "args": { + "hash": "sha256-jj1ccJQOX8oBx1XVKzI53B1sveq5kNADc2DB8bJhsf4=", + "owner": "tree-sitter-grammars", + "repo": "tree-sitter-bicep", + "rev": "0092c7d1bd6bb22ce0a6f78497d50ea2b87f19c0" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "qmljs": { + "nurl": { + "args": { + "hash": "sha256-Hf8LfrN3YjN9hpGtTVmK3ZjJ/b/fsRCg9FG7hSSj/mk=", + "owner": "yuja", + "repo": "tree-sitter-qmljs", + "rev": "0b2b25bcaa7d4925d5f0dda16f6a99c588a437f1" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "mermaid": { + "nurl": { + "args": { + "hash": "sha256-JwQ3jfwwOvM9eJWP/D3wXUBDysRxpa+mktYFajwA3IA=", + "owner": "monaqa", + "repo": "tree-sitter-mermaid", + "rev": "d787c66276e7e95899230539f556e8b83ee16f6d" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "matlab": { + "nurl": { + "args": { + "hash": "sha256-U3ZcZgI4ZjBNzk08s9lVdB968AlOQec2Dcy+qb0blZ0=", + "owner": "acristoffers", + "repo": "tree-sitter-matlab", + "rev": "b0a0198b182574cd3ca0447264c83331901b9338" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "ponylang": { + "nurl": { + "args": { + "hash": "sha256-fqr+PmsCEZr3sTQ2ttFrS8Cy9Z/R/6gNwjmcXedQ4CE=", + "owner": "mfelsche", + "repo": "tree-sitter-ponylang", + "rev": "ef66b151bc2604f431b5668fcec4747db4290e11" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "dhall": { + "nurl": { + "args": { + "hash": "sha256-q9OkKmp0Nor+YkFc8pBVAOoXoWzwjjzg9lBUKAUnjmQ=", + "owner": "jbellerb", + "repo": "tree-sitter-dhall", + "rev": "affb6ee38d629c9296749767ab832d69bb0d9ea8" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "pem": { + "nurl": { + "args": { + "hash": "sha256-cKjWtcz+4RgpoLT+CnbADtxnGj19u5L8y38PzgLUj5A=", + "owner": "mtoohey31", + "repo": "tree-sitter-pem", + "rev": "be67a4330a1aa507c7297bc322204f936ec1132c" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "passwd": { + "nurl": { + "args": { + "hash": "sha256-3UfuyJeblQBKjqZvLYyO3GoCvYJp+DvBwQGkR3pFQQ4=", + "owner": "ath3", + "repo": "tree-sitter-passwd", + "rev": "20239395eacdc2e0923a7e5683ad3605aee7b716" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "hosts": { + "nurl": { + "args": { + "hash": "sha256-f8ldDZD0I/D8IC566bZ4YgQE/b0maTE3BfzuzPfy92k=", + "owner": "ath3", + "repo": "tree-sitter-hosts", + "rev": "301b9379ce7dfc8bdbe2c2699a6887dcb73953f9" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "uxntal": { + "nurl": { + "args": { + "hash": "sha256-pgnKJe8aFL4k2RD1vJHJf/LOwwjr5vnJHWUNWvW+wbU=", + "owner": "Jummit", + "repo": "tree-sitter-uxntal", + "rev": "d68406066648cd6db4c6a2f11ec305af02079884" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "yuck": { + "nurl": { + "args": { + "hash": "sha256-n2g7nfmdg8vcz++KPqhaJ7muoOyQxSqgysoZ2PEv7os=", + "owner": "Philipp-M", + "repo": "tree-sitter-yuck", + "rev": "e3d91a3c65decdea467adebe4127b8366fa47919" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "prql": { + "nurl": { + "args": { + "hash": "sha256-bdT7LZ2x7BdUqLJRq4ENJTaIFnciac7l2dCxOSB09CI=", + "owner": "PRQL", + "repo": "tree-sitter-prql", + "rev": "09e158cd3650581c0af4c49c2e5b10c4834c8646" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "po": { + "nurl": { + "args": { + "hash": "sha256-iylo1e7CjLRZS1Yu4n3wy9cL9BGQ1Ai14TkJVT2Dpuo=", + "owner": "erasin", + "repo": "tree-sitter-po", + "rev": "417cee9abb2053ed26b19e7de972398f2da9b29e" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "nasm": { + "nurl": { + "args": { + "hash": "sha256-205joaeq4ZSyfgxagPQTsx0zpZwSEpq1VCQoHJ77OL8=", + "owner": "naclsn", + "repo": "tree-sitter-nasm", + "rev": "570f3d7be01fffc751237f4cfcf52d04e20532d1" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "gas": { + "nurl": { + "args": { + "hash": "sha256-HyLNnmK4jud2Ndkc+5MY9MlASh/ehPA/eQATsCVGcUw=", + "owner": "sirius94", + "repo": "tree-sitter-gas", + "rev": "60f443646b20edee3b7bf18f3a4fb91dc214259a" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "rst": { + "nurl": { + "args": { + "hash": "sha256-g3CovnXY15SkxAdVk15M4hAxizqLc551omwKKG+Vozg=", + "owner": "stsewd", + "repo": "tree-sitter-rst", + "rev": "25e6328872ac3a764ba8b926aea12719741103f1" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "capnp": { + "nurl": { + "args": { + "hash": "sha256-FKzh0c/mTURLss8mv/c/p3dNXQxE/r5P063GEM8un70=", + "owner": "amaanq", + "repo": "tree-sitter-capnp", + "rev": "fc6e2addf103861b9b3dffb82c543eb6b71061aa" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "smithy": { + "nurl": { + "args": { + "hash": "sha256-6z2Psw+cjC11CXoGOJ/lkBPJXKqECCSrhchOiAPmd14=", + "owner": "indoorvivants", + "repo": "tree-sitter-smithy", + "rev": "8327eb84d55639ffbe08c9dc82da7fff72a1ad07" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "vhdl": { + "nurl": { + "args": { + "hash": "sha256-wMVuixeG95CwehBr5I9MuGnvM9VAszroNVPo5MGPGF8=", + "owner": "jpt13653903", + "repo": "tree-sitter-vhdl", + "rev": "32d3e3daa745bf9f1665676f323be968444619e1" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "rego": { + "nurl": { + "args": { + "hash": "sha256-L6n6Z5y9t1ixpy9mktB9HVKy69jigqbIFB2SrSW/yoo=", + "owner": "FallenAngel97", + "repo": "tree-sitter-rego", + "rev": "9ac75e71b2d791e0aadeef68098319d86a2a14cf" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "nim": { + "nurl": { + "args": { + "hash": "sha256-KzAZf5vgrdp33esrgle71i0m52MvRJ3z/sMwzb+CueU=", + "owner": "alaviss", + "repo": "tree-sitter-nim", + "rev": "c5f0ce3b65222f5dbb1a12f9fe894524881ad590" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "hurl": { + "nurl": { + "args": { + "hash": "sha256-vu/zK/AILJXPn18TmQSKoap7BtUOwhCxAX9v8ekVrIo=", + "owner": "pfeiferj", + "repo": "tree-sitter-hurl", + "rev": "cd1a0ada92cc73dd0f4d7eedc162be4ded758591" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "markdoc": { + "nurl": { + "args": { + "hash": "sha256-rKkl9Xc0FFRe5Is5Nb/pPGeZTguJkvQJkGpBtmSfOXc=", + "owner": "markdoc-extra", + "repo": "tree-sitter-markdoc", + "rev": "5ffe71b29e8a3f94823913ea9cea51fcfa7e3bf8" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "opencl": { + "nurl": { + "args": { + "hash": "sha256-tymKOBQbbXAI4bUDSOnZaMoyhFuDwSInvqgGq0eTDl8=", + "owner": "lefp", + "repo": "tree-sitter-opencl", + "rev": "8e1d24a57066b3cd1bb9685bbc1ca9de5c1b78fb" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "just": { + "nurl": { + "args": { + "hash": "sha256-rTcdpSxCUOhS7oM8tbQsVxageiEgYopjBSbQf+cLdJY=", + "owner": "poliorcetics", + "repo": "tree-sitter-just", + "rev": "8d03cfdd7ab89ff76d935827de1b93450fa0ec0a" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "gn": { + "nurl": { + "args": { + "hash": "sha256-yZM2+4/uoEaQt2++dSMhTIAMezTKBIOjKCLpcffZVWU=", + "owner": "willcassella", + "repo": "tree-sitter-gn", + "rev": "e18d6e36a79b20dafb58f19d407bd38b0e60260e" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "blueprint": { + "nurl": { + "args": { + "hash": "sha256-QbkwdqH4Q+bqsp7XawUNXR45ROxfpMf+goCBFTw07I4=", + "owner": "gabmus", + "repo": "tree-sitter-blueprint", + "rev": "863cea9f83ad5637300478e0559262f1e791684b" + }, + "fetcher": "fetchFromGitLab" + }, + "subpath": null + }, + "forth": { + "nurl": { + "args": { + "hash": "sha256-vySBDu9cMnubu4+7/sBttNxg1S4/MxWUKpjwEa14Rws=", + "owner": "alexanderbrevig", + "repo": "tree-sitter-forth", + "rev": "90189238385cf636b9ee99ce548b9e5b5e569d48" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "fsharp": { + "nurl": { + "args": { + "hash": "sha256-HgHVIU67h9WXfj+yx7ukCSqucRvo16jugFhxWYY1kyk=", + "owner": "ionide", + "repo": "tree-sitter-fsharp", + "rev": "996ea9982bd4e490029f84682016b6793940113b" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "t32": { + "nurl": { + "args": { + "hash": "sha256-BRDlNZolMurXpUqnFbS+7ADTcuBthGDYVr6wBn9PIr4=", + "owner": "xasc", + "repo": "tree-sitter-t32", + "rev": "6da5e3cbabd376b566d04282005e52ffe67ef74a" + }, + "fetcher": "fetchFromGitLab" + }, + "subpath": null + }, + "typst": { + "nurl": { + "args": { + "hash": "sha256-n6RTRMJS3h+g+Wawjb7I9NJbz+w/SGi+DQVj1jiyGaU=", + "owner": "uben0", + "repo": "tree-sitter-typst", + "rev": "13863ddcbaa7b68ee6221cea2e3143415e64aea4" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "jinja2": { + "nurl": { + "args": { + "hash": "sha256-ksHel/kkWk4cyCx/+k8IfqjnID8i744WsZi9+AVSNpw=", + "owner": "varpeti", + "repo": "tree-sitter-jinja2", + "rev": "a533cd3c33aea6acb0f9bf9a56f35dcfe6a8eb53" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "jjdescription": { + "nurl": { + "args": { + "hash": "sha256-HPghz3mOukXrY0KQllOR7Kkl2U3+ukPBrXWKnJCwsqI=", + "owner": "kareigu", + "repo": "tree-sitter-jjdescription", + "rev": "1613b8c85b6ead48464d73668f39910dcbb41911" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "jq": { + "nurl": { + "args": { + "hash": "sha256-pek2Vg1osMYAdx6DfVdZhuIDb26op3i2cfvMrf5v3xY=", + "owner": "flurie", + "repo": "tree-sitter-jq", + "rev": "13990f530e8e6709b7978503da9bc8701d366791" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "wren": { + "nurl": { + "args": { + "hash": "sha256-CU08QY4X/u4W4AEkK+gUmy5P8/XoBHDJmWX1vdGjmsI=", + "owner": "~jummit", + "repo": "tree-sitter-wren", + "rev": "6748694be32f11e7ec6b5faeb1b48ca6156d4e06" + }, + "fetcher": "fetchFromSourcehut" + }, + "subpath": null + }, + "unison": { + "nurl": { + "args": { + "hash": "sha256-xveOQpCCkYdeiPkRbFlPNfXOpWW0lzCxfQbxXz+eurM=", + "owner": "kylegoetz", + "repo": "tree-sitter-unison", + "rev": "3c97db76d3cdbd002dfba493620c2d5df2fd6fa9" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "todotxt": { + "nurl": { + "args": { + "hash": "sha256-OeAh51rcFTiexAraRzIZUR/A8h9RPwKY7rmtc3ZzoRQ=", + "owner": "arnarg", + "repo": "tree-sitter-todotxt", + "rev": "3937c5cd105ec4127448651a21aef45f52d19609" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "strace": { + "nurl": { + "args": { + "hash": "sha256-lT4gv3PJm6x0GEvQmSHPzkkNA3G0by7AncppDKvpug0=", + "owner": "sigmaSd", + "repo": "tree-sitter-strace", + "rev": "2b18fdf9a01e7ec292cc6006724942c81beb7fd5" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "gemini": { + "nurl": { + "args": { + "hash": "sha256-grWpLh5ozSUct5sSI8M8qnWy72b7ruRuhOpoyswvJuU=", + "owner": "~nbsp", + "repo": "tree-sitter-gemini", + "rev": "3cc5e4bdf572d5df4277fc2e54d6299bd59a54b3" + }, + "fetcher": "fetchFromSourcehut" + }, + "subpath": null + }, + "agda": { + "nurl": { + "args": { + "hash": "sha256-EV0J38zcfSHaBqzu2Rcut1l20FpB+xneFRaizEX1DXg=", + "owner": "tree-sitter", + "repo": "tree-sitter-agda", + "rev": "c21c3a0f996363ed17b8ac99d827fe5a4821f217" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "templ": { + "nurl": { + "args": { + "hash": "sha256-DPVVdzAU3xGa1TpndlwPZr11zi1ToYkvqWDJeddfDYs=", + "owner": "vrischmann", + "repo": "tree-sitter-templ", + "rev": "db662414ccd6f7c78b1e834e7abe11c224b04759" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "dbml": { + "nurl": { + "args": { + "hash": "sha256-IxxUW6YYxP1hkwA9NEojEEE3c8pwvAI6juX8aF7NfMw=", + "owner": "dynamotn", + "repo": "tree-sitter-dbml", + "rev": "2e2fa5640268c33c3d3f27f7e676f631a9c68fd9" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "bitbake": { + "nurl": { + "args": { + "hash": "sha256-PSI1XVDGwDk5GjHjvCJfmBDfYM2Gmm1KR4h5KxBR1d0=", + "owner": "tree-sitter-grammars", + "repo": "tree-sitter-bitbake", + "rev": "10bacac929ff36a1e8f4056503fe4f8717b21b94" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "log": { + "nurl": { + "args": { + "hash": "sha256-lvN2it+pNyYvGIqtRI+zUZwPrj/3SLMZX9zordYg3IU=", + "owner": "Tudyx", + "repo": "tree-sitter-log", + "rev": "62cfe307e942af3417171243b599cc7deac5eab9" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "hoon": { + "nurl": { + "args": { + "hash": "sha256-2xrpyA5JCibGxaJkRmcgNreFHcCvJaYkHThSc6KAV1U=", + "owner": "urbit-pilled", + "repo": "tree-sitter-hoon", + "rev": "1d5df35af3e0afe592832a67b9fb3feeeba1f7b6" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "hocon": { + "nurl": { + "args": { + "hash": "sha256-9Zo3YYoo9mJ4Buyj7ofSrlZURrwstBo0vgzeTq1jMGw=", + "owner": "antosha417", + "repo": "tree-sitter-hocon", + "rev": "c390f10519ae69fdb03b3e5764f5592fb6924bcc" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "koka": { + "nurl": { + "args": { + "hash": "sha256-s1HA7HTzPBIl6Av+1f98b34oGcaOHMb/bBdbjxh1ta8=", + "owner": "mtoohey31", + "repo": "tree-sitter-koka", + "rev": "96d070c3700692858035f3524cc0ad944cef2594" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "tact": { + "nurl": { + "args": { + "hash": "sha256-z9ykKuxN54QBkT1+MPPNvlAS54xu+yb2Aa1exYws0us=", + "owner": "tact-lang", + "repo": "tree-sitter-tact", + "rev": "ec57ab29c86d632639726631fb2bb178d23e1c91" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "pkl": { + "nurl": { + "args": { + "hash": "sha256-uyW4mPS+sctj6TVqeg03Xd6nbxicHqWwsRFK9582PQI=", + "owner": "apple", + "repo": "tree-sitter-pkl", + "rev": "c03f04a313b712f8ab00a2d862c10b37318699ae" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "groovy": { + "nurl": { + "args": { + "hash": "sha256-Grp1ziaPyMNxoPbsJSiDCiKPXCtWJ/EC/d0OX/jqHF0=", + "owner": "murtaza64", + "repo": "tree-sitter-groovy", + "rev": "235009aad0f580211fc12014bb0846c3910130c1" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "fidl": { + "nurl": { + "args": { + "hash": "sha256-+s9AC7kAfPumREnc7xCSsYiaDwLp3uirLntwd2wK6Wo=", + "owner": "google", + "repo": "tree-sitter-fidl", + "rev": "bdbb635a7f5035e424f6173f2f11b9cd79703f8d" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "powershell": { + "nurl": { + "args": { + "hash": "sha256-TKiV7yfYY/WJ0US7mkJ3J7nBFBHtdGHgwzkDgZmyv1A=", + "owner": "airbus-cert", + "repo": "tree-sitter-powershell", + "rev": "c9316be0faca5d5b9fd3b57350de650755f42dc0" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "ld": { + "nurl": { + "args": { + "hash": "sha256-U+yqSO+vo1RAZrCqCojhY4HwjcjirZU/HgWDCdw3YGw=", + "owner": "mtoohey31", + "repo": "tree-sitter-ld", + "rev": "0e9695ae0ede47b8744a8e2ad44d4d40c5d4e4c9" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "hyprlang": { + "nurl": { + "args": { + "hash": "sha256-cVlhrAfL8lVHMicJxPqsBZl7NhbfbJXwH8Ga2TQLMc8=", + "owner": "tree-sitter-grammars", + "repo": "tree-sitter-hyprlang", + "rev": "27af9b74acf89fa6bed4fb8cb8631994fcb2e6f3" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "tcl": { + "nurl": { + "args": { + "hash": "sha256-GhK92+nbJ+M5/1ZnPbIJ3EuNub332YK+hyWiwyBqUmk=", + "owner": "tree-sitter-grammars", + "repo": "tree-sitter-tcl", + "rev": "56ad1fa6a34ba800e5495d1025a9b0fda338d5b8" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "supercollider": { + "nurl": { + "args": { + "hash": "sha256-mWTOZ3u9VGjEhjDeYJGd8aVxjVG9kJgKX/wHMZSsaEU=", + "owner": "madskjeldgaard", + "repo": "tree-sitter-supercollider", + "rev": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "glimmer": { + "nurl": { + "args": { + "hash": "sha256-CxoHlnIYRviu9VgD6w8cElmSQKdqb27vxSZh8DZiHuY=", + "owner": "ember-tooling", + "repo": "tree-sitter-glimmer", + "rev": "5dc6d1040e8ff8978ff3680e818d85447bbc10aa" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "ohm": { + "nurl": { + "args": { + "hash": "sha256-ik1Tv4oJPbyfyYXyS01cVgLRXSOA5lJZi7q0NASHk90=", + "owner": "novusnota", + "repo": "tree-sitter-ohm", + "rev": "80f14f0e477ddacc1e137d5ed8e830329e3fb7a3" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "earthfile": { + "nurl": { + "args": { + "hash": "sha256-I4qmdDKDXvUJRM0ThN6Hy2oMiGo+FA6QIdfgAzYgWiE=", + "owner": "glehmann", + "repo": "tree-sitter-earthfile", + "rev": "dbfb970a59cd87b628d087eb8e3fbe19c8e20601" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "adl": { + "nurl": { + "args": { + "hash": "sha256-gYEtTjjy8qClYg4+ZnKwNUWMxKTc3sUXQdsVCwB7H6w=", + "owner": "adl-lang", + "repo": "tree-sitter-adl", + "rev": "2787d04beadfbe154d3f2da6e98dc45a1b134bbf" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "ldif": { + "nurl": { + "args": { + "hash": "sha256-xivgajrM0sqbEcX+ZN0h5C+s7KJVJanrvxRQ/j1VNIQ=", + "owner": "kepet19", + "repo": "tree-sitter-ldif", + "rev": "0a917207f65ba3e3acfa9cda16142ee39c4c1aaa" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "xtc": { + "nurl": { + "args": { + "hash": "sha256-teUDDvH8Km1WHNXyrUtX1yULYOaTgaAwT6aCaR4MTfs=", + "owner": "Alexis-Lapierre", + "repo": "tree-sitter-xtc", + "rev": "7bc11b736250c45e25cfb0215db2f8393779957e" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "move": { + "nurl": { + "args": { + "hash": "sha256-vlBpL57GQgAFgQf6gUePRlqX6PBSvsmCU1ZmkLOFb0A=", + "owner": "tzakian", + "repo": "tree-sitter-move", + "rev": "8bc0d1692caa8763fef54d48068238d9bf3c0264" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "pest": { + "nurl": { + "args": { + "hash": "sha256-Jpp14NLungcVHvl7wyp6Egrc/ToNrZzwDSkXKD+Z3Uo=", + "owner": "pest-parser", + "repo": "tree-sitter-pest", + "rev": "a8a98a824452b1ec4da7f508386a187a2f234b85" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "elisp": { + "nurl": { + "args": { + "hash": "sha256-rWxVE17ipTu45Ey8PFvZvaJUqAb7SRACqfu+f8Ry3/M=", + "owner": "Wilfred", + "repo": "tree-sitter-elisp", + "rev": "e5524fdccf8c22fc726474a910e4ade976dfc7bb" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "gherkin": { + "nurl": { + "args": { + "hash": "sha256-6Ywu4HPfgpKsuZ6wo2b1CA3Z+lD+/3XEyJi2l2Q66+Y=", + "owner": "SamyAB", + "repo": "tree-sitter-gherkin", + "rev": "43873ee8de16476635b48d52c46f5b6407cb5c09" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "thrift": { + "nurl": { + "args": { + "hash": "sha256-owZbs8ttjKrqTA8fQ/NmBGyIUUItSUvvW4hRv0NPV8Y=", + "owner": "tree-sitter-grammars", + "repo": "tree-sitter-thrift", + "rev": "68fd0d80943a828d9e6f49c58a74be1e9ca142cf" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "circom": { + "nurl": { + "args": { + "hash": "sha256-wosqwiDkK1rytGWMJApz1M42Sme9OaWXC0rmj7vM4g8=", + "owner": "Decurity", + "repo": "tree-sitter-circom", + "rev": "02150524228b1e6afef96949f2d6b7cc0aaf999e" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "snakemake": { + "nurl": { + "args": { + "hash": "sha256-d2n1fsdt4+1hv4In+o6GpGyfeyVHpn39Njm7tQ2zyYQ=", + "owner": "osthomas", + "repo": "tree-sitter-snakemake", + "rev": "e909815acdbe37e69440261ebb1091ed52e1dec6" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "cylc": { + "nurl": { + "args": { + "hash": "sha256-Mllpfigv2i0sG1nQ55/ooR1q4HS3bJPIgjN9XyZC3Ec=", + "owner": "elliotfontaine", + "repo": "tree-sitter-cylc", + "rev": "30dd40d9bf23912e4aefa93eeb4c7090bda3d0f6" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "quint": { + "nurl": { + "args": { + "hash": "sha256-Eo9jvIhiRlMvNYSqQVS9/sIIkmIWpDJfenqObTWgy40=", + "owner": "gruhn", + "repo": "tree-sitter-quint", + "rev": "eebbd01edfeff6404778c92efe5554e42e506a18" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "spade": { + "nurl": { + "args": { + "hash": "sha256-nn1jZduKVfFXnnQyT+rm/+7U/Ewe+K3+RlEBmTB4WfQ=", + "owner": "spade-lang", + "repo": "tree-sitter-spade", + "rev": "78bf09a88fc1d396f66b69879f908fc6bd2e6934" + }, + "fetcher": "fetchFromGitLab" + }, + "subpath": null + }, + "amber": { + "nurl": { + "args": { + "hash": "sha256-MGzTBXu0E4ZFW4Dmg5CMGR4SmwbVaHFEKl1A9K9Q7og=", + "owner": "amber-lang", + "repo": "tree-sitter-amber", + "rev": "c6df3ec2ec243ed76550c525e7ac3d9a10c6c814" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "koto": { + "nurl": { + "args": { + "hash": "sha256-X1YnhmOpVJ+ENHXSK7jZxl1SXxa0UM07nkXdejlQDOA=", + "owner": "koto-lang", + "repo": "tree-sitter-koto", + "rev": "b420f7922d0d74905fd0d771e5b83be9ee8a8a9a" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "gpr": { + "nurl": { + "args": { + "hash": "sha256-tqff8Aaj9uebJeNYuNdaDBllsj/mwRStWhhY3zB8xlU=", + "owner": "brownts", + "repo": "tree-sitter-gpr", + "rev": "cea857d3c18d1385d1f5b66cd09ea1e44173945c" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "vento": { + "nurl": { + "args": { + "hash": "sha256-h8yC+MJIAH7DM69UQ8moJBmcmrSZkxvWrMb+NqtYB2Y=", + "owner": "ventojs", + "repo": "tree-sitter-vento", + "rev": "3b32474bc29584ea214e4e84b47102408263fe0e" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "nginx": { + "nurl": { + "args": { + "hash": "sha256-Sa7audtwH8EgrHJ5XIUKTdveZU2pDPoUq70InQ6qcKA=", + "owner": "joncoole", + "repo": "tree-sitter-nginx", + "rev": "b4b61db443602b69410ab469c122c01b1e685aa0" + }, + "fetcher": "fetchFromGitLab" + }, + "subpath": null + }, + "ql": { + "nurl": { + "args": { + "hash": "sha256-mJ/bj09mT1WTaiKoXiRXDM7dkenf5hv2ArXieeTVe6I=", + "owner": "tree-sitter", + "repo": "tree-sitter-ql", + "rev": "1fd627a4e8bff8c24c11987474bd33112bead857" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "gren": { + "nurl": { + "args": { + "hash": "sha256-42NfFE/QQi1LacquvGHaR3tGVeaU2n/q7tMhwV5+w4E=", + "owner": "MaeBrooks", + "repo": "tree-sitter-gren", + "rev": "76554f4f2339f5a24eed19c58f2079b51c694152" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "ghostty": { + "nurl": { + "args": { + "hash": "sha256-JejaX7aABfszSvbon/lahgWSf4VtcGMWYxpsDGK9o88=", + "owner": "bezhermoso", + "repo": "tree-sitter-ghostty", + "rev": "8438a93b44367e962b2ea3a3b6511885bebd196a" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "tera": { + "nurl": { + "args": { + "hash": "sha256-R8IeM7VA9ndKcpDXVfaPQKBzSpOmB4ECo1Pm1Lzo5lM=", + "owner": "uncenter", + "repo": "tree-sitter-tera", + "rev": "e8d679a29c03e64656463a892a30da626e19ed8e" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "fga": { + "nurl": { + "args": { + "hash": "sha256-3wcmVNq22uB1Fx5PLSzgKs9FEQKZmkwAKsxOqo3SdDs=", + "owner": "matoous", + "repo": "tree-sitter-fga", + "rev": "5005e8dd976e1f67beb3d23204580eb6f8b4c965" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "csv": { + "nurl": { + "args": { + "hash": "sha256-p0qH7twC3yN8QIrnr0TKx2Nb7qTaDclhFGePR8qLXHU=", + "owner": "weartist", + "repo": "rainbow-csv-tree-sitter", + "rev": "d3dbf916446131417e4c2ea9eb8591b23b466d27" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "yara": { + "nurl": { + "args": { + "hash": "sha256-twcbL2fKOE0PdiEboSIObzAedljZ3arBm6QQUw/W5HQ=", + "owner": "egibs", + "repo": "tree-sitter-yara", + "rev": "eb3ede203275c38000177f72ec0f9965312806ef" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "ink": { + "nurl": { + "args": { + "hash": "sha256-aVSaj9cS0fHRp6SIfjSL2FiZmchL5OksRbKVC8eCAxo=", + "owner": "rhizoome", + "repo": "tree-sitter-ink", + "rev": "8486e9b1627b0bc6b2deb9ee8102277a7c1281ac" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "sourcepawn": { + "nurl": { + "args": { + "hash": "sha256-u8/wM2Dj+uO3g24MsGZfH9zkABCEaWWFI8EX3fxuljk=", + "owner": "nilshelmig", + "repo": "tree-sitter-sourcepawn", + "rev": "f2af8d0dc14c6790130cceb2a20027eb41a8297c" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "tlaplus": { + "nurl": { + "args": { + "hash": "sha256-Oc+VYBLP1XcfMTWmcYyJRXzq1Ty838TnF2fPGIsjtOE=", + "owner": "tlaplus-community", + "repo": "tree-sitter-tlaplus", + "rev": "4ba91b07b97741a67f61221d0d50e6d962e4987e" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "werk": { + "nurl": { + "args": { + "hash": "sha256-VPY1fMYGSF1+87ia+d7b7l8PzNIoKwAbAT+yw5KHjjQ=", + "owner": "little-bonsai", + "repo": "tree-sitter-werk", + "rev": "92b0f7fe98465c4c435794a58e961306193d1c1e" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "debian": { + "nurl": { + "args": { + "hash": "sha256-VjWoF5oI+K101xKvF+MDsy1+eCkkUytn39PHKqOCkjo=", + "owner": "MggMuggins", + "repo": "tree-sitter-debian", + "rev": "9b3f4b78c45aab8a2f25a5f9e7bbc00995bc3dde" + }, + "fetcher": "fetchFromGitLab" + }, + "subpath": null + }, + "pug": { + "nurl": { + "args": { + "hash": "sha256-Yk1oBv9Flz+QX5tyFZwx0y67I5qgbnLhwYuAvLi9eV8=", + "owner": "zealot128", + "repo": "tree-sitter-pug", + "rev": "13e9195370172c86a8b88184cc358b23b677cc46" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "dunstrc": { + "nurl": { + "args": { + "hash": "sha256-yfjOly1NvdNIFc3zzFb8XSCA+IW9uIzjtQRhf4/NQzY=", + "owner": "rotmh", + "repo": "tree-sitter-dunstrc", + "rev": "9cb9d5cc51cf5e2a47bb2a0e2f2e519ff11c1431" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "rust-format-args": { + "nurl": { + "args": { + "hash": "sha256-IOc2etC92RsZ02+TY+j+Wy19OY6rz8kI3q0D+BrdiCg=", + "owner": "nik-rev", + "repo": "tree-sitter-rust-format-args", + "rev": "84ffe550e261cf5ea40a0ec31849ba2443bae99f" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "clarity": { + "nurl": { + "args": { + "hash": "sha256-7waqNMra5KRtnEXPUn2vDhNJRYvBn28MsVhVT6s9eE8=", + "owner": "xlittlerag", + "repo": "tree-sitter-clarity", + "rev": "7fa54825fdd971a1a676f885384f024fe2b7384a" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "alloy": { + "nurl": { + "args": { + "hash": "sha256-1ZQ9KkPBhK4pmkvZ7y1kEDeTs0y/fE3+2ea0cKCtQG8=", + "owner": "mattsre", + "repo": "tree-sitter-alloy", + "rev": "3e18eb4e97f06c57a3925f3d20bef6329a6eaef3" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "luau": { + "nurl": { + "args": { + "hash": "sha256-a+TJFLt77G4UyvcLz5Nsc6gvsgCTwmpZDNyfN8YUJDc=", + "owner": "polychromatist", + "repo": "tree-sitter-luau", + "rev": "ec187cafba510cddac265329ca7831ec6f3b9955" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "caddyfile": { + "nurl": { + "args": { + "hash": "sha256-WaCWKq3wqjhWdsUd2vAT/JPqaxbHhOsaZrCg6MeXZZw=", + "owner": "caddyserver", + "repo": "tree-sitter-caddyfile", + "rev": "b04bdb4ec53e40c44afbf001e15540f60a296aef" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + }, + "properties": { + "nurl": { + "args": { + "hash": "sha256-4WgGbU6fthFH1DcvlQiqNGXucCfxA+hANZ7Y+r8eXHg=", + "owner": "tree-sitter-grammars", + "repo": "tree-sitter-properties", + "rev": "579b62f5ad8d96c2bb331f07d1408c92767531d9" + }, + "fetcher": "fetchFromGitHub" + }, + "subpath": null + } +} diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix index 4221b653127c..b66ba8dfa721 100644 --- a/pkgs/by-name/he/helix/package.nix +++ b/pkgs/by-name/he/helix/package.nix @@ -1,88 +1,154 @@ { - fetchzip, - fetchpatch, + fetchFromGitHub, lib, rustPlatform, mdbook, - git, + gitMinimal, installShellFiles, versionCheckHook, - nix-update-script, + runCommand, + removeReferencesTo, + pkgs, + tree-sitter, + lockedGrammars ? lib.importJSON ./grammars.json, + grammarsOverlay ? ( + final: prev: { + tree-sitter-sql = prev.tree-sitter-sql.override { + generate = false; + }; + tree-sitter-qmljs = prev.tree-sitter-qmljs.overrideAttrs { + dontCheckForBrokenSymlinks = true; + }; + } + ), }: -rustPlatform.buildRustPackage (finalAttrs: { - pname = "helix"; - version = "25.07.1"; - outputs = [ - "out" - "doc" - ]; +rustPlatform.buildRustPackage ( + finalAttrs: + let + lockedVersionsOverlay = + final: prev: + lib.mapAttrs ( + drvName: grammar: + let + lockedGrammar = lockedGrammars.${lib.removePrefix "tree-sitter-" drvName}; + in + (prev.${drvName}.override { + location = lockedGrammar.subpath; + }).overrideAttrs + { + version = lib.sources.shortRev lockedGrammar.nurl.args.rev; + src = (pkgs.${lockedGrammar.nurl.fetcher} lockedGrammar.nurl.args); + } + ) prev; - # This release tarball includes source code for the tree-sitter grammars, - # which is not ordinarily part of the repository. - src = fetchzip { - url = "https://github.com/helix-editor/helix/releases/download/${finalAttrs.version}/helix-${finalAttrs.version}-source.tar.xz"; - hash = "sha256-Pj/lfcQXRWqBOTTWt6+Gk61F9F1UmeCYr+26hGdG974="; - stripRoot = false; - }; + tree-sitter-grammars = + lib.filterAttrs (drvName: _: lib.hasAttr (lib.removePrefix "tree-sitter-" drvName) lockedGrammars) + ( + tree-sitter.grammarsScope.overrideScope ( + lib.composeExtensions lockedVersionsOverlay grammarsOverlay + ) + ); - patches = [ - # Support mdbook 0.5.x: escape HTML tags in command descriptions - ./mdbook-0.5-support.patch - ]; + # Dynamic libraries for the grammars always use the `.so` extension, also on Darwin (should use `.dylib`) + # See here: https://github.com/helix-editor/helix/pull/14982 + # Switch to `stdenv.hostPlatform.extensions.sharedLibrary` once the fix above reaches the next release - postPatch = '' - # mdbook 0.5 uses asset hashing for CSS/JS files - # Remove custom theme to use default mdbook theme with correct asset references - rm -f book/theme/index.hbs - ''; + grammarsFarm = runCommand "helix-grammars" { } ( + lib.concatMapAttrsStringSep "\n" (_: grammar: '' + install -D ${grammar}/parser $out/${grammar.language}.so + ${lib.getExe removeReferencesTo} -t ${grammar} $out/${grammar.language}.so + '') (lib.filterAttrs (_: lib.isDerivation) tree-sitter-grammars) + ); - cargoHash = "sha256-Mf0nrgMk1MlZkSyUN6mlM5lmTcrOHn3xBNzmVGtApEU="; + lockedGrammarsCount = lib.length (lib.attrNames lockedGrammars); - nativeBuildInputs = [ - git - installShellFiles - mdbook - ]; - - env.HELIX_DEFAULT_RUNTIME = "${placeholder "out"}/lib/runtime"; - - postBuild = '' - mdbook build book -d ../book-html - ''; - - postInstall = '' - # not needed at runtime - rm -r runtime/grammars/sources - - mkdir -p $out/lib $doc/share/doc - cp -r runtime $out/lib - installShellCompletion contrib/completion/hx.{bash,fish,zsh} - mkdir -p $out/share/{applications,icons/hicolor/256x256/apps} - cp contrib/Helix.desktop $out/share/applications - cp contrib/helix.png $out/share/icons/hicolor/256x256/apps - cp -r ../book-html $doc/share/doc/$name - ''; - - nativeInstallCheckInputs = [ - versionCheckHook - ]; - versionCheckProgram = "${placeholder "out"}/bin/hx"; - doInstallCheck = true; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = { - description = "Post-modern modal text editor"; - homepage = "https://helix-editor.com"; - changelog = "https://github.com/helix-editor/helix/blob/${finalAttrs.version}/CHANGELOG.md"; - license = lib.licenses.mpl20; - mainProgram = "hx"; - maintainers = with lib.maintainers; [ - danth - yusdacra + runtimeDir = runCommand "helix-runtime" { } '' + cp -r --no-preserve=mode ${finalAttrs.src}/runtime $out + rm -r $out/grammars + ln -s ${grammarsFarm} $out/grammars + count=$(ls -1 "$out/grammars/" | wc -l) + if [ "$count" -ne ${toString lockedGrammarsCount} ]; then + echo "Expected ${toString lockedGrammarsCount} grammars, found $count" + exit 1 + fi + ''; + in + { + pname = "helix"; + version = "25.07.1"; + outputs = [ + "out" + "doc" ]; - }; -}) + + src = fetchFromGitHub { + owner = "helix-editor"; + repo = "helix"; + tag = "${finalAttrs.version}"; + hash = "sha256-RFSzGAcB0mMg/02ykYfTWXzQjLFu2CJ4BkS5HZ/6pBo="; + }; + + patches = [ + # Support mdbook 0.5.x: escape HTML tags in command descriptions + ./mdbook-0.5-support.patch + ]; + + postPatch = '' + # mdbook 0.5 uses asset hashing for CSS/JS files + # Remove custom theme to use default mdbook theme with correct asset references + rm -f book/theme/index.hbs + ''; + + cargoHash = "sha256-Mf0nrgMk1MlZkSyUN6mlM5lmTcrOHn3xBNzmVGtApEU="; + + nativeBuildInputs = [ + gitMinimal + installShellFiles + mdbook + ]; + + env = { + HELIX_DEFAULT_RUNTIME = runtimeDir; + HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1"; + }; + + postBuild = '' + mdbook build book -d ../book-html + ''; + + postInstall = '' + mkdir -p $out/lib $doc/share/doc + installShellCompletion contrib/completion/hx.{bash,fish,zsh} + mkdir -p $out/share/{applications,icons/hicolor/256x256/apps} + cp contrib/Helix.desktop $out/share/applications/Helix.desktop + cp contrib/helix.png $out/share/icons/hicolor/256x256/apps/helix.png + cp -r ../book-html $doc/share/doc/$name + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/hx"; + doInstallCheck = true; + + passthru = { + updateScript = ./update.sh; + runtime = runtimeDir; + inherit tree-sitter-grammars; + }; + + meta = { + description = "Post-modern modal text editor"; + homepage = "https://helix-editor.com"; + changelog = "https://github.com/helix-editor/helix/blob/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mpl20; + mainProgram = "hx"; + maintainers = with lib.maintainers; [ + aciceri + danth + yusdacra + ]; + }; + } +) diff --git a/pkgs/by-name/he/helix/update.sh b/pkgs/by-name/he/helix/update.sh new file mode 100755 index 000000000000..096374e02693 --- /dev/null +++ b/pkgs/by-name/he/helix/update.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nurl nix-update python3 + +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +echo "Updating helix source to the latest stable..." +nix-update helix + +echo "Fetching updated helixSource..." +HELIX_SRC=$(nix-instantiate --eval -A "helix.src.outPath" --raw) + +echo "Generating grammars.json..." +"$SCRIPT_DIR/generate_grammars.py" \ + "$HELIX_SRC/languages.toml" \ + -o "$SCRIPT_DIR/grammars.json" + +if [ $? -ne 0 ]; then + echo "Error: Failed to generate grammars.json" >&2 + exit 1 +fi + +echo "Done! Updated grammars.json" diff --git a/pkgs/by-name/hi/hiredis/package.nix b/pkgs/by-name/hi/hiredis/package.nix index 2ad7a1c14aac..c692c92fd0ec 100644 --- a/pkgs/by-name/hi/hiredis/package.nix +++ b/pkgs/by-name/hi/hiredis/package.nix @@ -20,8 +20,10 @@ stdenv.mkDerivation (finalAttrs: { openssl ]; - PREFIX = "\${out}"; - USE_SSL = 1; + env = { + PREFIX = "\${out}"; + USE_SSL = 1; + }; meta = { homepage = "https://github.com/redis/hiredis"; diff --git a/pkgs/by-name/ip/ipmiutil/package.nix b/pkgs/by-name/ip/ipmiutil/package.nix index 0755bd10415a..3368b1b58e66 100644 --- a/pkgs/by-name/ip/ipmiutil/package.nix +++ b/pkgs/by-name/ip/ipmiutil/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ipmiutil"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { url = "mirror://sourceforge/project/ipmiutil/ipmiutil-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-BIEbLmV/+YzTHkS5GnAMnzPEyd2To2yPyYfeH0fCQCQ="; + sha256 = "sha256-N/m8jmsYwRVeTV6jjIe4OQi3rMekT7xeOvST8m74t2c="; }; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix index 3db6811643d9..2c6352051e79 100644 --- a/pkgs/by-name/ja/jay/package.nix +++ b/pkgs/by-name/ja/jay/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-T7053eAH3IqkAxNZpYHdC6Z7JZtArrOqGMjoIccjemI="; - SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; + env.SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/by-name/ke/keyscope/package.nix b/pkgs/by-name/ke/keyscope/package.nix index 2a3ee5db8dcf..7ad7b8bb246b 100644 --- a/pkgs/by-name/ke/keyscope/package.nix +++ b/pkgs/by-name/ke/keyscope/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { echo "fn main() {}" > build.rs ''; - VERGEN_GIT_SEMVER = "v${finalAttrs.version}"; + env.VERGEN_GIT_SEMVER = "v${finalAttrs.version}"; # Test require network access doCheck = false; diff --git a/pkgs/by-name/ku/kubectl-oidc-login/package.nix b/pkgs/by-name/ku/kubectl-oidc-login/package.nix new file mode 100644 index 000000000000..6837d7acecea --- /dev/null +++ b/pkgs/by-name/ku/kubectl-oidc-login/package.nix @@ -0,0 +1,46 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "kubectl-oidc-login"; + version = "1.35.2"; + + src = fetchFromGitHub { + owner = "int128"; + repo = "kubelogin"; + tag = "v${finalAttrs.version}"; + hash = "sha256-jSPNvr+spZvilTooK7s6l8CyvP5tzSWxqJzaoJCA5AM="; + }; + + vendorHash = "sha256-otzcOmW3mkiJrIv69wme5cHp5/iO2YSH+ecZgeX2aV0="; + + ldflags = [ + "-X main.version=${finalAttrs.version}" + ]; + + # Rename output binary to kubectl- so kubectl recognizes it on $PATH. + postInstall = '' + mv $out/bin/{kubelogin,${finalAttrs.meta.mainProgram}} + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Kubernetes kubelogin plugin to add OpenID Connect authentication to kubectl. Run \"kubectl oidc-login ...\""; + # Quirk: we have to write "oidc_login" instead of "oidc-login" + # (at least on Mac "aarch64-darwin" and "x86_64_linux"), otherwise calling + # "kubectl oidc-login " fails that it can't find the underlying plugin in $PATH. + mainProgram = "kubectl-oidc_login"; + homepage = "https://github.com/int128/kubelogin"; + changelog = "https://github.com/int128/kubelogin/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.malteneuss ]; + }; +}) diff --git a/pkgs/by-name/ku/kubectl/package.nix b/pkgs/by-name/ku/kubectl/package.nix index b446f21cfdd5..a4a76bc4b211 100644 --- a/pkgs/by-name/ku/kubectl/package.nix +++ b/pkgs/by-name/ku/kubectl/package.nix @@ -9,7 +9,7 @@ kubernetes.overrideAttrs (_: { "convert" ]; - WHAT = lib.concatStringsSep " " [ + env.WHAT = toString [ "cmd/kubectl" "cmd/kubectl-convert" ]; diff --git a/pkgs/by-name/ku/kubernetes/package.nix b/pkgs/by-name/ku/kubernetes/package.nix index 4f3451cbab3d..adcb906fcac5 100644 --- a/pkgs/by-name/ku/kubernetes/package.nix +++ b/pkgs/by-name/ku/kubernetes/package.nix @@ -51,7 +51,7 @@ buildGoModule (finalAttrs: { patches = [ ./fixup-addonmanager-lib-path.patch ]; - WHAT = lib.concatStringsSep " " components; + env.WHAT = toString components; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix index 9071d99bfa8e..fbe9891ea4ed 100644 --- a/pkgs/by-name/le/lean4/package.nix +++ b/pkgs/by-name/le/lean4/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.27.0"; + version = "4.28.0"; # Using a vendored version rather than nixpkgs' version to match the exact version required by # Lean. Apparently, even a slight version change can impact greatly the final performance. @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "leanprover"; repo = "lean4"; tag = "v${finalAttrs.version}"; - hash = "sha256-nxAznaWQEilzn93SZTKLKL7TZEPD5LRcJLFmgoCWsXA="; + hash = "sha256-K6lWXZ8XVEv91skjCal+hML2Tzr9G804j9Roq+4HXQQ="; }; postPatch = diff --git a/pkgs/by-name/li/libcap_ng/package.nix b/pkgs/by-name/li/libcap_ng/package.nix index 99b7547c8fcc..da302c3cf49b 100644 --- a/pkgs/by-name/li/libcap_ng/package.nix +++ b/pkgs/by-name/li/libcap_ng/package.nix @@ -61,5 +61,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.linux; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ grimmauld ]; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "libcap-ng_project" finalAttrs.version; }; }) diff --git a/pkgs/by-name/li/libedgetpu/package.nix b/pkgs/by-name/li/libedgetpu/package.nix index fc5911ffb120..7fc12afe8f19 100644 --- a/pkgs/by-name/li/libedgetpu/package.nix +++ b/pkgs/by-name/li/libedgetpu/package.nix @@ -14,7 +14,9 @@ let flatbuffers_23_5_26 = flatbuffers.overrideAttrs (oldAttrs: rec { version = "23.5.26"; cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [ "-DFLATBUFFERS_BUILD_SHAREDLIB=ON" ]; - NIX_CXXSTDLIB_COMPILE = "-std=c++17"; + env = (oldAttrs.env or { }) // { + NIX_CXXSTDLIB_COMPILE = "-std=c++17"; + }; configureFlags = (oldAttrs.configureFlags or [ ]) ++ [ "--enable-shared" ]; src = fetchFromGitHub { owner = "google"; @@ -67,13 +69,15 @@ stdenv.mkDerivation { nativeBuildInputs = [ xxd ]; - NIX_CXXSTDLIB_COMPILE = "-std=c++17"; + env = { + NIX_CXXSTDLIB_COMPILE = "-std=c++17"; - TFROOT = fetchFromGitHub { - owner = "tensorflow"; - repo = "tensorflow"; - rev = "v2.16.1"; - hash = "sha256-UPvK5Kc/FNVJq3FchN5IIBBObvcHtAPVv0ARzWzA35M="; + TFROOT = fetchFromGitHub { + owner = "tensorflow"; + repo = "tensorflow"; + rev = "v2.16.1"; + hash = "sha256-UPvK5Kc/FNVJq3FchN5IIBBObvcHtAPVv0ARzWzA35M="; + }; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index 5776b96aed81..ccbe6862a525 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -21,14 +21,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-ffi"; # must match the version used in mautrix-signal # see https://github.com/mautrix/signal/issues/401 - version = "0.86.12"; + version = "0.87.1"; src = fetchFromGitHub { fetchSubmodules = true; owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-XVq1fvhUF0WqSs1lJRCBRuhOW4idY6Nm21UdX4/6TE8="; + hash = "sha256-yr2+yM7RmUQ7mNDMCcaM5cCpudof14JuO5J6D944k0U="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { env.BORING_BSSL_PATH = "${boringssl-wrapper}"; env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++"; - cargoHash = "sha256-vat7vjL9HDY/m7CLUJNpU3NZ79nCVHxLO5tEtaEDBnE="; + cargoHash = "sha256-rqxp+RZuuT+nFudNeCgA8g04C9KT1Qi59K4b2avL5u4="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/li/libucl/package.nix b/pkgs/by-name/li/libucl/package.nix index de8483c68737..65350dc3d778 100644 --- a/pkgs/by-name/li/libucl/package.nix +++ b/pkgs/by-name/li/libucl/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libucl"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "vstakhov"; repo = "libucl"; rev = finalAttrs.version; - sha256 = "sha256-dub829xZ10sJ5qwegYUiGoyAVLiwg44GKSzz+BMLJis="; + sha256 = "sha256-m6VRtFNKm6+T7pPP2u3avMkVTmye4CM6Z7wjhddVMZE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/lingua-franca/package.nix b/pkgs/by-name/li/lingua-franca/package.nix index 1950d43a33b0..cf62ecd7d974 100644 --- a/pkgs/by-name/li/lingua-franca/package.nix +++ b/pkgs/by-name/li/lingua-franca/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ jdk17_headless ]; - _JAVA_HOME = "${jdk17_headless}/"; + env._JAVA_HOME = "${jdk17_headless}/"; postPatch = '' substituteInPlace bin/lfc \ diff --git a/pkgs/by-name/lo/logrotate/package.nix b/pkgs/by-name/lo/logrotate/package.nix index b0c08570fc13..c4f49d4b420c 100644 --- a/pkgs/by-name/lo/logrotate/package.nix +++ b/pkgs/by-name/lo/logrotate/package.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ lib.maintainers.tobim ]; platforms = lib.platforms.all; mainProgram = "logrotate"; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "logrotate_project" finalAttrs.version; }; }) diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix index fbe14a54991c..8d05f31cf4ac 100644 --- a/pkgs/by-name/ma/mautrix-signal/package.nix +++ b/pkgs/by-name/ma/mautrix-signal/package.nix @@ -20,14 +20,14 @@ let in buildGoModule rec { pname = "mautrix-signal"; - version = "26.01"; - tag = "v0.2601.0"; + version = "26.02"; + tag = "v0.2602.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; inherit tag; - hash = "sha256-zvB0CbSzrLcUJiEIj3vtDq2C0XEYUNRbaUAn+636+uk="; + hash = "sha256-FWFAH+jtPdLG9vJS4QXpFjsGWUzILW17WRFyfdnFlAE="; }; buildInputs = @@ -44,7 +44,7 @@ buildGoModule rec { CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ]; - vendorHash = "sha256-Eo7T/63ywNnn/t0RzjwkSYRmrL0IMdIsv4wqrQFv+5U="; + vendorHash = "sha256-TFz5P8czj8J9+QTFHjffCldw8Je2+DiM49W7jv5rY/I="; ldflags = [ "-X" diff --git a/pkgs/by-name/mo/monocle/package.nix b/pkgs/by-name/mo/monocle/package.nix index 4225988bd176..04de34596e3e 100644 --- a/pkgs/by-name/mo/monocle/package.nix +++ b/pkgs/by-name/mo/monocle/package.nix @@ -8,27 +8,36 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "monocle"; - version = "0.9.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bgpkit"; repo = "monocle"; tag = "v${finalAttrs.version}"; - hash = "sha256-64oa3rmPR1PFmtGti1LVubO+2lY4VIkdMBKP6/IeyFk="; + hash = "sha256-F7z8WZAj00dYfawUiCTLnipkut9QAnXiO8DgIhJ/78U="; }; - cargoHash = "sha256-rSvq+aHI5u0W1RG3JQooljeDmxTHE9ywdPguHdV3T+c="; + cargoHash = "sha256-+XdOvjQJkeDBH/3XtMX0SCGyji10UgnSme4oZuhwiq8="; # require internet access - checkFlags = [ - "--skip=datasets::as2org::tests::test_crawling" - "--skip=datasets::ip::tests::test_fetch_ip_info" - "--skip=datasets::rpki::validator::tests::test_bgp" - "--skip=datasets::rpki::validator::tests::test_list_asn" - "--skip=datasets::rpki::validator::tests::test_list_prefix" - "--skip=datasets::rpki::validator::tests::test_validation" - "--skip=filters::search::tests::test_build_broker_with_filters" - "--skip=filters::search::tests::test_pagination_logic" + checkFlags = map (t: "--skip=${t}") [ + "datasets::as2org::tests::test_crawling" + "datasets::ip::tests::test_fetch_ip_info" + "datasets::rpki::validator::tests::test_bgp" + "datasets::rpki::validator::tests::test_list_asn" + "datasets::rpki::validator::tests::test_list_prefix" + "datasets::rpki::validator::tests::test_validation" + "filters::search::tests::test_build_broker_with_filters" + "filters::search::tests::test_pagination_logic" + "lens::country::tests::test_all" + "lens::country::tests::test_lookup_by_code" + "lens::country::tests::test_lookup_by_name" + "lens::country::tests::test_lookup_code" + "lens::country::tests::test_search_with_args" + "lens::ip::tests::test_fetch_ip_info" + "lens::search::tests::test_build_broker_with_filters" + "lens::search::tests::test_pagination_logic" + "server::handlers::country::tests::test_country_lens_lookup" ]; doInstallCheck = true; diff --git a/pkgs/by-name/mu/mudlet/package.nix b/pkgs/by-name/mu/mudlet/package.nix index e7b7e0e26883..981ca5159bf8 100644 --- a/pkgs/by-name/mu/mudlet/package.nix +++ b/pkgs/by-name/mu/mudlet/package.nix @@ -103,8 +103,10 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; - WITH_FONTS = "NO"; - WITH_UPDATER = "NO"; + env = { + WITH_FONTS = "NO"; + WITH_UPDATER = "NO"; + }; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 7cd3bdc99779..467875671799 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "namespace-cli"; - version = "0.0.479"; + version = "0.0.486"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${finalAttrs.version}"; - hash = "sha256-EznGetJAjUMgQjTHgWA4nv3c6RobrSU28lEjN0PgsiE="; + hash = "sha256-FBk4PVIKpy6MvquqtQyfgw1/Twgef/CHE7/+mpsJjTw="; }; - vendorHash = "sha256-dk32fNNO5nN/RuYOu+vx8Gjxdcs1vt6K9CrV1iXn++E="; + vendorHash = "sha256-GPO3vdk26K54VmjHmg1PL/nQd6GTz/ZQk8ZpNQHoqSQ="; subPackages = [ "cmd/nsc" diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index 168457b35776..d08a34c08484 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -41,31 +41,33 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: { cargoHash = "sha256-DD2c63JHMdzwD1OmC7c9dMB59qjvdAYZ9drQf3f8xCs="; - SKIA_SOURCE_DIR = - let - repo = fetchFromGitHub { - owner = "rust-skia"; - repo = "skia"; - # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - tag = "m140-0.87.4"; - hash = "sha256-pHxqTrqguZcPmuZgv0ASbJ3dgn8JAyHI7+PdBX5gAZQ="; - }; - # The externals for skia are taken from skia/DEPS - externals = linkFarm "skia-externals" ( - lib.mapAttrsToList (name: value: { - inherit name; - path = fetchgit value; - }) (lib.importJSON ./skia-externals.json) - ); - in - runCommand "source" { } '' - cp -R ${repo} $out - chmod -R +w $out - ln -s ${externals} $out/third_party/externals - ''; + env = { + SKIA_SOURCE_DIR = + let + repo = fetchFromGitHub { + owner = "rust-skia"; + repo = "skia"; + # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia + tag = "m140-0.87.4"; + hash = "sha256-pHxqTrqguZcPmuZgv0ASbJ3dgn8JAyHI7+PdBX5gAZQ="; + }; + # The externals for skia are taken from skia/DEPS + externals = linkFarm "skia-externals" ( + lib.mapAttrsToList (name: value: { + inherit name; + path = fetchgit value; + }) (lib.importJSON ./skia-externals.json) + ); + in + runCommand "source" { } '' + cp -R ${repo} $out + chmod -R +w $out + ln -s ${externals} $out/third_party/externals + ''; - SKIA_GN_COMMAND = "${gn}/bin/gn"; - SKIA_NINJA_COMMAND = "${ninja}/bin/ninja"; + SKIA_GN_COMMAND = "${gn}/bin/gn"; + SKIA_NINJA_COMMAND = "${ninja}/bin/ninja"; + }; nativeBuildInputs = [ makeWrapper @@ -124,7 +126,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: { install -m444 -Dt $out/share/applications assets/neovide.desktop ''; - disallowedReferences = [ finalAttrs.SKIA_SOURCE_DIR ]; + disallowedReferences = [ finalAttrs.env.SKIA_SOURCE_DIR ]; meta = { description = "Simple, no-nonsense, cross-platform graphical user interface for Neovim"; diff --git a/pkgs/by-name/ne/netpbm/package.nix b/pkgs/by-name/ne/netpbm/package.nix index 3c45aaed917e..224e95d900fd 100644 --- a/pkgs/by-name/ne/netpbm/package.nix +++ b/pkgs/by-name/ne/netpbm/package.nix @@ -56,9 +56,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - # Environment variables - STRIPPROG = "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"; - postPatch = '' # Install libnetpbm.so symlink to correct destination substituteInPlace lib/Makefile \ @@ -102,7 +99,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postConfigure ''; - env = lib.optionalAttrs stdenv.cc.isClang { + env = { + STRIPPROG = "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"; + } + // lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; }; diff --git a/pkgs/by-name/ne/networkmanager/package.nix b/pkgs/by-name/ne/networkmanager/package.nix index fca3f75c8426..542ce9d60633 100644 --- a/pkgs/by-name/ne/networkmanager/package.nix +++ b/pkgs/by-name/ne/networkmanager/package.nix @@ -64,11 +64,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "networkmanager"; - version = "1.54.3"; + version = "1.56.0"; src = fetchurl { url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/${finalAttrs.version}/downloads/NetworkManager-${finalAttrs.version}.tar.xz"; - hash = "sha256-z0/vw76WgCxaTas+aQvcTOTHglGVTvChtlAm2IZwmYk="; + hash = "sha256-WaMtOFzB564m5DeYxvEtB/9hmKvQQewGILOgjPwCHMw="; }; outputs = [ diff --git a/pkgs/by-name/nf/nf-test/package.nix b/pkgs/by-name/nf/nf-test/package.nix index 82dc41015d81..308738c0a120 100644 --- a/pkgs/by-name/nf/nf-test/package.nix +++ b/pkgs/by-name/nf/nf-test/package.nix @@ -4,18 +4,18 @@ makeWrapper, nextflow, nf-test, - openjdk11, + openjdk17, stdenv, testers, }: stdenv.mkDerivation (finalAttrs: { pname = "nf-test"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { url = "https://github.com/askimed/nf-test/releases/download/v${finalAttrs.version}/nf-test-${finalAttrs.version}.tar.gz"; - hash = "sha256-LLylgv34HiMXg+sjBbMdeLVPMV5+h+Z2xEWCiBqbNEY="; + hash = "sha256-A9k8HVIPqbfHZKqSY2wqOhgvZ9aSb3K4SdoLOypB2j8="; }; sourceRoot = "."; @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 nf-test.jar $out/share/nf-test mkdir -p $out/bin - makeWrapper ${openjdk11}/bin/java $out/bin/nf-test \ + makeWrapper ${openjdk17}/bin/java $out/bin/nf-test \ --add-flags "-jar $out/share/nf-test/nf-test.jar" \ --prefix PATH : ${lib.makeBinPath [ nextflow ]} \ diff --git a/pkgs/by-name/ng/ngt/package.nix b/pkgs/by-name/ng/ngt/package.nix index f892bfde284b..bf59304befe7 100644 --- a/pkgs/by-name/ng/ngt/package.nix +++ b/pkgs/by-name/ng/ngt/package.nix @@ -25,8 +25,10 @@ stdenv.mkDerivation (finalAttrs: { openblas ]; - NIX_ENFORCE_NO_NATIVE = !enableAVX; - __AVX2__ = if enableAVX then 1 else 0; + env = { + NIX_ENFORCE_NO_NATIVE = !enableAVX; + __AVX2__ = if enableAVX then 1 else 0; + }; meta = { homepage = "https://github.com/yahoojapan/NGT"; diff --git a/pkgs/by-name/ni/nitrocli/package.nix b/pkgs/by-name/ni/nitrocli/package.nix index b94ac382b00c..81ee54667807 100644 --- a/pkgs/by-name/ni/nitrocli/package.nix +++ b/pkgs/by-name/ni/nitrocli/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { doCheck = false; # link against packaged libnitrokey - USE_SYSTEM_LIBNITROKEY = 1; + env.USE_SYSTEM_LIBNITROKEY = 1; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ni/nix-playground/package.nix b/pkgs/by-name/ni/nix-playground/package.nix index e3449b420713..b816714ee882 100644 --- a/pkgs/by-name/ni/nix-playground/package.nix +++ b/pkgs/by-name/ni/nix-playground/package.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { # Tests require certificates # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582674047 - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; pythonImportsCheck = [ "nix_playground" ]; diff --git a/pkgs/by-name/nl/nlopt/package.nix b/pkgs/by-name/nl/nlopt/package.nix index 5a78662322e8..17cd33778114 100644 --- a/pkgs/by-name/nl/nlopt/package.nix +++ b/pkgs/by-name/nl/nlopt/package.nix @@ -19,6 +19,10 @@ swig, # Optionally exclude Luksan solvers to allow licensing under MIT withoutLuksanSolvers ? false, + + # Builds docs on-demand + withDocs ? false, + # Build static on-demand withStatic ? stdenv.hostPlatform.isStatic, @@ -37,49 +41,16 @@ let in clangStdenv.mkDerivation (finalAttrs: { pname = "nlopt"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "stevengj"; repo = "nlopt"; tag = "v${finalAttrs.version}"; - hash = "sha256-mZRmhXrApxfiJedk+L/poIP2DR/BkV04c5fiwPGAyjI="; + hash = "sha256-i+Cd2VLMbI4PUSXennR8jgF+/ZkzKX9WkVTPtayr8vs="; }; - outputs = [ - "out" - "doc" - ]; - - patches = [ - # 26-03-2025: `mkdocs.yml` is missing a link for the subpage related to the Java bindings. - # 26-03-2025: This commit was merged after v2.10.0 was released, and has not been made - # 26-03-2025: part of a release. - (fetchpatch { - name = "missing-java-reference-mkdocs"; - url = "https://github.com/stevengj/nlopt/commit/7e34f1a6fe82ed27daa6111d83c4d5629555454b.patch"; - hash = "sha256-XivfZtgIGLyTtU+Zo2jSQAx2mVdGLJ8PD7VSSvGR/5Q="; - }) - - # 26-03-2025: The docs pages still list v2.7.1 as the newest version. - # 26-03-2025: This commit was merged after v2.10.0 was released, and has not been made - # 26-03-2025: part of a release. - (fetchpatch { - name = "update-index-md"; - url = "https://github.com/stevengj/nlopt/commit/2c4147832eff7ea15d0536c82351a9e169f85e43.patch"; - hash = "sha256-BXcbNUyu20f3N146v6v9cpjSj5CwuDtesp6lAqOK2KY="; - }) - - # 26-03-2025: There is an off-by-one error in the test/CMakeLists.txt - # 26-03-2025: that causes the tests to attempt to run disabled Luksan solver code, - # 26-03-2025: which in turn causes the test suite to fail. - # 26-03-2025: See https://github.com/stevengj/nlopt/pull/605 - (fetchpatch { - name = "fix-nondisabled-luksan-algorithm"; - url = "https://github.com/stevengj/nlopt/commit/7817ec19f21be6877a4b79777fc5315a52c6850b.patch"; - hash = "sha256-KgdAMSYKOQuraun4HNr9GOx48yjyeQk6W3IgWRA44oo="; - }) - ]; + outputs = [ "out" ] ++ lib.optional withDocs "doc"; postPatch = '' substituteInPlace nlopt.pc.in \ @@ -123,7 +94,7 @@ clangStdenv.mkDerivation (finalAttrs: { lib.cmakeFeature "Python_EXECUTABLE" "${buildPythonBindingsEnv.interpreter}" ); - postBuild = '' + postBuild = lib.optionalString withDocs '' ${buildDocsEnv.interpreter} -m mkdocs build \ --config-file ../mkdocs.yml \ --site-dir $doc \ diff --git a/pkgs/by-name/nm/nmrpflash/package.nix b/pkgs/by-name/nm/nmrpflash/package.nix index ac616ee67405..b365c5737a7a 100644 --- a/pkgs/by-name/nm/nmrpflash/package.nix +++ b/pkgs/by-name/nm/nmrpflash/package.nix @@ -24,8 +24,10 @@ stdenv.mkDerivation (finalAttrs: { libpcap ]; - PREFIX = "${placeholder "out"}"; - STANDALONE_VERSION = finalAttrs.version; + env = { + PREFIX = "${placeholder "out"}"; + STANDALONE_VERSION = finalAttrs.version; + }; preInstall = '' mkdir -p $out/bin diff --git a/pkgs/by-name/nn/nncp/package.nix b/pkgs/by-name/nn/nncp/package.nix index 4efa9bf5778f..129558bbc006 100644 --- a/pkgs/by-name/nn/nncp/package.nix +++ b/pkgs/by-name/nn/nncp/package.nix @@ -29,8 +29,10 @@ stdenv.mkDerivation (finalAttrs: { ]; # Build parameters - CFGPATH = cfgPath; - SENDMAIL = "sendmail"; + env = { + CFGPATH = cfgPath; + SENDMAIL = "sendmail"; + }; preConfigure = "export GOCACHE=$NIX_BUILD_TOP/gocache"; diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix index 1d13a79da25f..948288be260a 100644 --- a/pkgs/by-name/oc/oculante/package.nix +++ b/pkgs/by-name/oc/oculante/package.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Bn2HxmFiqOeb3oUnUL/K0SahcFWRlY9RrbGU4orQz+Y="; - SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; + env.SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix index 09a3392ab09c..9de1c2aa4e74 100644 --- a/pkgs/by-name/op/open-scq30/package.nix +++ b/pkgs/by-name/op/open-scq30/package.nix @@ -12,25 +12,35 @@ gtk4, libadwaita, pango, - cargo-make, + just, + sqlite, + wayland, + libxkbcommon, + libGL, + libx11, + libxcursor, + libxi, + autoPatchelfHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "open-scq30"; - version = "1.12.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Oppzippy"; repo = "OpenSCQ30"; rev = "v${finalAttrs.version}"; - hash = "sha256-DL2hYm1j27K0nnBvE3iGnguqm0m1k56bkuG+6+u4u4c="; + hash = "sha256-BSh10x0cbxfds/3m7XrWmVI1/9Li/Uh9OZA6I9gH8qE="; }; nativeBuildInputs = [ pkg-config protobuf wrapGAppsHook4 - cargo-make + just + autoPatchelfHook ]; buildInputs = [ @@ -41,23 +51,41 @@ rustPlatform.buildRustPackage (finalAttrs: { gtk4 libadwaita pango + sqlite + libxkbcommon ]; - cargoHash = "sha256-3K+/CpTGWSjCRa2vOEcDvLIiZMdntugIqnzkXF4wkng="; + # Wayland and X11 libs are required at runtime since winit uses dlopen + runtimeDependencies = [ + wayland + libxkbcommon + libGL + libx11 + libxcursor + libxi + ]; + + cargoHash = "sha256-410iXY9Ae3CPRX82LmbkWh+huna6YwBV2gtdfc3ap90="; env.INSTALL_PREFIX = placeholder "out"; # Requires headphones doCheck = false; + postPatch = '' + patchShebangs ./gui/scripts ./cli/scripts ./scripts + ''; + buildPhase = '' - cargo make --profile release build + just build-cli + just build-gui ''; installPhase = '' - cargo make --profile release install + just install ${placeholder "out"} ''; + passthru.updateScript = nix-update-script { }; meta = { description = "Cross platform application for controlling settings of Soundcore headphones"; homepage = "https://github.com/Oppzippy/OpenSCQ30"; diff --git a/pkgs/by-name/op/openresolv/package.nix b/pkgs/by-name/op/openresolv/package.nix index c924ad4700d6..853cf18b12ff 100644 --- a/pkgs/by-name/op/openresolv/package.nix +++ b/pkgs/by-name/op/openresolv/package.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd2; maintainers = [ ]; platforms = lib.platforms.unix; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "openresolv_project" finalAttrs.version; }; }) diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix index d10210c4de64..d403bdfe8207 100644 --- a/pkgs/by-name/pa/parca-agent/package.nix +++ b/pkgs/by-name/pa/parca-agent/package.nix @@ -8,18 +8,18 @@ buildGoModule (finalAttrs: { pname = "parca-agent"; - version = "0.45.0"; + version = "0.45.1"; src = fetchFromGitHub { owner = "parca-dev"; repo = "parca-agent"; tag = "v${finalAttrs.version}"; - hash = "sha256-WGR4EFsM7C7lf8VbPefw/4sQQD2ld3jCJE52M7MbRi8="; + hash = "sha256-NcvEU9MgAYK7jFbg/jdUP/ltgzDAIR6JNphv5Xkcba4="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-KwXSiZsviyR0wDKYFwlDUvJ+7PpEUoSyLsw2ZVcyK60="; + vendorHash = "sha256-/V4proGF8Vpv2w4+3vZv4tcKkEgBi6eZGMjXW9vrLts="; buildInputs = [ stdenv.cc.libc.static diff --git a/pkgs/by-name/pl/plasticscm-client-core-unwrapped/package.nix b/pkgs/by-name/pl/plasticscm-client-core-unwrapped/package.nix index f7af77556fe1..349c1c838afa 100644 --- a/pkgs/by-name/pl/plasticscm-client-core-unwrapped/package.nix +++ b/pkgs/by-name/pl/plasticscm-client-core-unwrapped/package.nix @@ -12,11 +12,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasticscm-client-core-unwrapped"; - version = "11.0.16.9925"; + version = "11.0.16.9943"; src = fetchurl { url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-client-core_${finalAttrs.version}_amd64.deb"; - hash = "sha256-cysJFw10nTNh+WzDCFFN2DLVwhbeSnOJ5JGMNQEqd60="; + hash = "sha256-8YQhrRxqRfyc3n2MfVGOchOlRpr2WuteOR40dIwMOF4="; nativeBuildInputs = [ dpkg ]; downloadToTemp = true; recursiveHash = true; diff --git a/pkgs/by-name/pl/plasticscm-client-gui-unwrapped/package.nix b/pkgs/by-name/pl/plasticscm-client-gui-unwrapped/package.nix index f78e747319a2..b9db0ac21e4e 100644 --- a/pkgs/by-name/pl/plasticscm-client-gui-unwrapped/package.nix +++ b/pkgs/by-name/pl/plasticscm-client-gui-unwrapped/package.nix @@ -11,11 +11,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasticscm-client-gui-unwrapped"; - version = "11.0.16.9925"; + version = "11.0.16.9943"; src = fetchurl { url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-client-gui_${finalAttrs.version}_amd64.deb"; - hash = "sha256-nzq5Wj/UDvBUGDNgSd/Ib+0TwD+uq1hN1J5OZCvH7sE="; + hash = "sha256-h3yMePj9064YSw5kIHSuTEwF5puDEaEKpylQdmzIXUE="; nativeBuildInputs = [ dpkg ]; downloadToTemp = true; recursiveHash = true; diff --git a/pkgs/by-name/pl/plasticscm-theme/package.nix b/pkgs/by-name/pl/plasticscm-theme/package.nix index 351667d7f038..2db0b0830059 100644 --- a/pkgs/by-name/pl/plasticscm-theme/package.nix +++ b/pkgs/by-name/pl/plasticscm-theme/package.nix @@ -11,7 +11,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasticscm-theme"; - version = "11.0.16.9925"; + version = "11.0.16.9943"; src = fetchurl { url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-theme_${finalAttrs.version}_amd64.deb"; diff --git a/pkgs/by-name/pn/pngcheck/package.nix b/pkgs/by-name/pn/pngcheck/package.nix index 161f1b800ecd..3d41663e4347 100644 --- a/pkgs/by-name/pn/pngcheck/package.nix +++ b/pkgs/by-name/pn/pngcheck/package.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation (finalAttrs: { ''; makefile = "Makefile.unx"; - makeFlags = [ "ZPATH=${zlib.static}/lib" ]; nativeBuildInputs = [ installShellFiles ]; @@ -31,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm555 -t $out/bin/ pngcheck + installBin pngcheck installManPage $pname.1 runHook postInstall ''; diff --git a/pkgs/by-name/po/pocketsphinx/package.nix b/pkgs/by-name/po/pocketsphinx/package.nix index 08d3510e072f..1fbb27762623 100644 --- a/pkgs/by-name/po/pocketsphinx/package.nix +++ b/pkgs/by-name/po/pocketsphinx/package.nix @@ -55,7 +55,10 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; passthru = { - updateScript = gitUpdater { rev-prefix = "v"; }; + updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "rc"; + }; tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/pr/prr/package.nix b/pkgs/by-name/pr/prr/package.nix index 6fa8a417a58f..57c09cb8c8db 100644 --- a/pkgs/by-name/pr/prr/package.nix +++ b/pkgs/by-name/pr/prr/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pkg-config ]; - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + checkInputs = [ cacert ]; meta = { diff --git a/pkgs/by-name/py/pylint-exit/package.nix b/pkgs/by-name/py/pylint-exit/package.nix index 62aa1fe9a2c0..5a99780225ad 100644 --- a/pkgs/by-name/py/pylint-exit/package.nix +++ b/pkgs/by-name/py/pylint-exit/package.nix @@ -27,7 +27,7 @@ buildPythonApplication rec { buildInputs = [ m2r ]; # setup.py reads its version from the TRAVIS_TAG environment variable - TRAVIS_TAG = version; + env.TRAVIS_TAG = version; checkPhase = '' ${python.interpreter} -m doctest pylint_exit.py diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix index c47be258500f..33c3be604056 100644 --- a/pkgs/by-name/rq/rq/package.nix +++ b/pkgs/by-name/rq/rq/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm build.rs ''; - VERGEN_SEMVER = finalAttrs.version; + env.VERGEN_SEMVER = finalAttrs.version; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/sa/salt/package.nix b/pkgs/by-name/sa/salt/package.nix index dffa0fd87f5f..9d15aa93d6e8 100644 --- a/pkgs/by-name/sa/salt/package.nix +++ b/pkgs/by-name/sa/salt/package.nix @@ -65,7 +65,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { ++ extraInputs; # Don't use fixed dependencies on Darwin - USE_STATIC_REQUIREMENTS = "0"; + env.USE_STATIC_REQUIREMENTS = "0"; # The tests fail due to socket path length limits at the very least; # possibly there are more issues but I didn't leave the test suite running diff --git a/pkgs/by-name/sa/sapling/package.nix b/pkgs/by-name/sa/sapling/package.nix index 47fc32138f26..26ee322b641d 100644 --- a/pkgs/by-name/sa/sapling/package.nix +++ b/pkgs/by-name/sa/sapling/package.nix @@ -159,16 +159,18 @@ python312Packages.buildPythonApplication { libiconv ]; - HGNAME = "sl"; - LIBCLANG_PATH = "${lib.getLib libclang}/lib"; - SAPLING_OSS_BUILD = "true"; - SAPLING_VERSION = version; - SAPLING_VERSION_HASH = - let - sha1Hash = builtins.hashString "sha1" version; - hexSubstring = builtins.substring 0 16 sha1Hash; - in - lib.trivial.fromHexString hexSubstring; + env = { + HGNAME = "sl"; + LIBCLANG_PATH = "${lib.getLib libclang}/lib"; + SAPLING_OSS_BUILD = "true"; + SAPLING_VERSION = version; + SAPLING_VERSION_HASH = + let + sha1Hash = builtins.hashString "sha1" version; + hexSubstring = builtins.substring 0 16 sha1Hash; + in + lib.trivial.fromHexString hexSubstring; + }; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/sa/savepagenow/package.nix b/pkgs/by-name/sa/savepagenow/package.nix index 1f8b9b3242ca..230db6ed68d7 100644 --- a/pkgs/by-name/sa/savepagenow/package.nix +++ b/pkgs/by-name/sa/savepagenow/package.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication (finalAttrs: { sha256 = "sha256-ztM1g71g8SN1LTyFF7sxaLhC3+nVsC9fJwfYPjkUsdE="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; build-system = with python3Packages; [ setuptools-scm ]; diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index 65269477d807..b6926b3b29de 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sentry-native"; - version = "0.12.6"; + version = "0.12.8"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; tag = finalAttrs.version; - hash = "sha256-2GapfbYtfo+Dw5KJjQ07ni1bUyLoVt6bINOBdohFKrI="; + hash = "sha256-cdi9B0XxORIXwTgS6Se/FePSqsMbbo8/KOr3Ir0Ip+Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index 24a2f1fc11e5..4094c6e99f91 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -135,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ mdaniels5757 ]; platforms = lib.platforms.linux; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "shadow_project" finalAttrs.version; }; passthru = { diff --git a/pkgs/by-name/sh/shtk/package.nix b/pkgs/by-name/sh/shtk/package.nix new file mode 100644 index 000000000000..5799b8738776 --- /dev/null +++ b/pkgs/by-name/sh/shtk/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "shtk"; + version = "1.7"; + + src = fetchFromGitHub { + owner = "jmmv"; + repo = "shtk"; + tag = "shtk-${finalAttrs.version}"; + hash = "sha256-EnJpysBI00JqLsRzdrHW62gV0wXx/Q+tpLR26jrgukU="; + }; + + outputs = [ + "out" + "dev" + "man" + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + + configureFlags = [ + "SHTK_SHELL=${stdenv.shell}" + ]; + + enableParallelBuilding = true; + + doCheck = true; + + postInstall = '' + # The "shtk" binary is only used when building packages that need shtk at + # runtime, so it's only a developer tool. + moveToOutput bin "$dev" + + moveToOutput share/aclocal "$dev" + moveToOutput lib/pkgconfig "$dev" + + substituteInPlace "$dev/lib/pkgconfig/shtk.pc" \ + --replace-fail "$out/bin/shtk" "$dev/bin/shtk" + + # Do not install tests. This is a weird pattern that not many packages + # follow. + rm -rf "$out/tests" + ''; + + meta = { + description = "Application toolkit for programmers writing POSIX-compliant shell scripts"; + longDescription = '' + The Shell Toolkit, or shtk for short, is an application toolkit + for programmers writing POSIX-compliant shell scripts. + + shtk provides a collection of reusable modules that work on a wide + variety of operating systems and shell interpreters. These modules are all + ready to be used by calling the provided shtk_import primitive and + "compiling" the shell scripts into their final form using the shtk(1) + utility. + + shtk is purely written in the shell scripting language so there are no + dependencies to be installed, and is known to be compatible with at least + bash, dash, pdksh and zsh. + ''; + homepage = "https://github.com/jmmv/shtk"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.jmmv ]; + platforms = lib.platforms.unix; + mainProgram = "shtk"; + }; +}) diff --git a/pkgs/by-name/sn/snapraid/package.nix b/pkgs/by-name/sn/snapraid/package.nix index b4ec7d34f968..b280e5b6b68c 100644 --- a/pkgs/by-name/sn/snapraid/package.nix +++ b/pkgs/by-name/sn/snapraid/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-IoK37ZXlMRLDPjzsLUqcfcu4asdstFJYgHc2wAg9lno="; }; - VERSION = finalAttrs.version; + env.VERSION = finalAttrs.version; doCheck = true; diff --git a/pkgs/by-name/sq/sqlite-vss/package.nix b/pkgs/by-name/sq/sqlite-vss/package.nix index efb677e4fe0d..29152369aee8 100644 --- a/pkgs/by-name/sq/sqlite-vss/package.nix +++ b/pkgs/by-name/sq/sqlite-vss/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional stdenv.hostPlatform.isLinux gomp ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; - SQLITE_VSS_CMAKE_VERSION = finalAttrs.version; + env.SQLITE_VSS_CMAKE_VERSION = finalAttrs.version; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ss/ssh-agent-switcher/package.nix b/pkgs/by-name/ss/ssh-agent-switcher/package.nix new file mode 100644 index 000000000000..cb4892fee7de --- /dev/null +++ b/pkgs/by-name/ss/ssh-agent-switcher/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + installShellFiles, + openssh, + shtk, +}: + +rustPlatform.buildRustPackage rec { + pname = "ssh-agent-switcher"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "jmmv"; + repo = "ssh-agent-switcher"; + tag = "ssh-agent-switcher-${version}"; + hash = "sha256-p9W0H25pWDB+GCrwLwuVruX9p8b8kICpp+6I11ym1aw="; + }; + + cargoHash = "sha256-WioA/RjXOAHM9QWl/lxnb7gqzcp76rus7Rv+IfCYceg="; + + nativeBuildInputs = [ + installShellFiles + shtk.dev + ]; + + nativeCheckInputs = [ openssh ]; + + checkPhase = '' + runHook preCheck + + cargoCheckHook + + shtk build -m shtk_unittest_main -o inttest inttest.sh + MODE="${stdenv.hostPlatform.rust.rustcTarget}/release" ./inttest + + runHook postCheck + ''; + + postInstall = '' + installManPage ssh-agent-switcher.1 + + install -Dm644 README.md -t $out/share/doc/ssh-agent-switcher/ + install -Dm644 NEWS.md -t $out/share/doc/ssh-agent-switcher/ + install -Dm644 COPYING -t $out/share/doc/ssh-agent-switcher/ + ''; + + meta = { + description = "SSH agent forwarding and tmux done right"; + longDescription = '' + ssh-agent-switcher is a daemon that proxies SSH agent connections to any + valid forwarded agent provided by sshd. This allows long-lived processes + such as terminal multiplexers like tmux or screen to access the + connection-specific forwarded agents. + ''; + homepage = "https://github.com/jmmv/ssh-agent-switcher"; + changelog = "https://github.com/jmmv/ssh-agent-switcher/blob/ssh-agent-switcher-${version}/NEWS.md"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.jmmv ]; + mainProgram = "ssh-agent-switcher"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/su/sub-store-frontend/package.nix b/pkgs/by-name/su/sub-store-frontend/package.nix index 853f2a1586c7..b6322d911365 100644 --- a/pkgs/by-name/su/sub-store-frontend/package.nix +++ b/pkgs/by-name/su/sub-store-frontend/package.nix @@ -13,13 +13,13 @@ buildNpmPackage (finalAttrs: { pname = "sub-store-frontend"; - version = "2.16.13"; + version = "2.16.15"; src = fetchFromGitHub { owner = "sub-store-org"; repo = "Sub-Store-Front-End"; tag = finalAttrs.version; - hash = "sha256-aqwmuTD2PgMGJgpBhFj2lqRcPqxhir+NHLNsFRLjG98="; + hash = "sha256-YlN3nv/wbHMUocQbt77iq5vD8FTJAdysDEmRRZSbQkE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/su/sub-store/package.nix b/pkgs/by-name/su/sub-store/package.nix index f54dc73066e8..b251492e9b17 100644 --- a/pkgs/by-name/su/sub-store/package.nix +++ b/pkgs/by-name/su/sub-store/package.nix @@ -15,13 +15,13 @@ buildNpmPackage (finalAttrs: { pname = "sub-store"; - version = "2.21.21"; + version = "2.21.25"; src = fetchFromGitHub { owner = "sub-store-org"; repo = "Sub-Store"; tag = finalAttrs.version; - hash = "sha256-b8UU7MrkoWMxo7AXQSvLrmjC4PqOFSSNglW7yOFddIs="; + hash = "sha256-/ltYEwzH6F0C0nMhtptJeJWxgewJ3uABlvSCZSgOufA="; }; sourceRoot = "${finalAttrs.src.name}/backend"; diff --git a/pkgs/by-name/un/unifi/package.nix b/pkgs/by-name/un/unifi/package.nix index 7d4a314bb6ed..cbaf91789b49 100644 --- a/pkgs/by-name/un/unifi/package.nix +++ b/pkgs/by-name/un/unifi/package.nix @@ -10,12 +10,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "unifi-controller"; - version = "10.1.84"; + version = "10.1.85"; # see https://community.ui.com/releases / https://www.ui.com/download/unifi src = fetchurl { url = "https://dl.ui.com/unifi/${finalAttrs.version}/unifi_sysvinit_all.deb"; - hash = "sha256-GHsaEbHh+t8AYOtc1LAMryWDNdz01EASQdfiiPp2T3E="; + hash = "sha256-bmTk17n2N7+SV+E90C8xoeFVoTgA6WhX746wOTSiU6c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/un/unstructured-api/package.nix b/pkgs/by-name/un/unstructured-api/package.nix index 0528753a0d9e..6082424e7368 100644 --- a/pkgs/by-name/un/unstructured-api/package.nix +++ b/pkgs/by-name/un/unstructured-api/package.nix @@ -144,7 +144,7 @@ let ++ google-api-core.optional-dependencies.grpc ++ unstructured.optional-dependencies.all-docs ); - version = "0.0.92"; + version = "0.1.1"; unstructured_api_nltk_data = python3.pkgs.nltk.dataDir (d: [ d.punkt d.averaged-perceptron-tagger @@ -158,7 +158,7 @@ stdenvNoCC.mkDerivation { owner = "Unstructured-IO"; repo = "unstructured-api"; rev = version; - hash = "sha256-kPPgLb6J0vg2bpFl85N+sVrapnozS/7pCcqG0xHYcMY="; + hash = "sha256-xQwgk7cjerKxLn1P5ogVbNHuHCFijai13n/1bBNvsYo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 0cb22af94bd6..27dd6e4abe9b 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -254,5 +254,7 @@ stdenv.mkDerivation (finalAttrs: { "uuid" ]; priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages + + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "kernel" finalAttrs.version; }; }) diff --git a/pkgs/by-name/uw/uwsgi/package.nix b/pkgs/by-name/uw/uwsgi/package.nix index 9af8e230f42b..0da10531d2ff 100644 --- a/pkgs/by-name/uw/uwsgi/package.nix +++ b/pkgs/by-name/uw/uwsgi/package.nix @@ -126,11 +126,23 @@ stdenv.mkDerivation (finalAttrs: { lib.optional withPAM "pam" ++ lib.optional withSystemd "systemd_logger" ); - # UWSGI_INCLUDES environment variable required for "auto" plugins - # to be detected. See uwsgiconfig.py for more details. - UWSGI_INCLUDES = lib.concatStringsSep "," ( - map (p: "${lib.getDev p}/include") finalAttrs.buildInputs - ); + env = { + # UWSGI_INCLUDES environment variable required for "auto" plugins + # to be detected. See uwsgiconfig.py for more details. + UWSGI_INCLUDES = lib.concatStringsSep "," ( + map (p: "${lib.getDev p}/include") finalAttrs.buildInputs + ); + } + // lib.optionalAttrs (lib.any (x: x.name == "php") needed) { + # this is a hack to make the php plugin link with session.so (which on nixos is a separate package) + # the hack works in coordination with ./additional-php-ldflags.patch + UWSGICONFIG_PHP_LDFLAGS = lib.concatStringsSep "," [ + "-Wl" + "-rpath=${php-embed.extensions.session}/lib/php/extensions/" + "--library-path=${php-embed.extensions.session}/lib/php/extensions/" + "-l:session.so" + ]; + }; passthru = { inherit python3; @@ -154,17 +166,6 @@ stdenv.mkDerivation (finalAttrs: { runHook postConfigure ''; - # this is a hack to make the php plugin link with session.so (which on nixos is a separate package) - # the hack works in coordination with ./additional-php-ldflags.patch - UWSGICONFIG_PHP_LDFLAGS = lib.optionalString (lib.any (x: x.name == "php") needed) ( - lib.concatStringsSep "," [ - "-Wl" - "-rpath=${php-embed.extensions.session}/lib/php/extensions/" - "--library-path=${php-embed.extensions.session}/lib/php/extensions/" - "-l:session.so" - ] - ); - buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/ux/uxplay/package.nix b/pkgs/by-name/ux/uxplay/package.nix index a685b40dfaa6..1e38370cba9d 100644 --- a/pkgs/by-name/ux/uxplay/package.nix +++ b/pkgs/by-name/ux/uxplay/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxplay"; - version = "1.73"; + version = "1.73.3"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; rev = "v${finalAttrs.version}"; - hash = "sha256-cPewe1pO/PknEBogcXU5WdDOvqya7bC6aIt3itHsrEw="; + hash = "sha256-Fz9zraaFBqdUdRZ/OhoFe/kSGyBMkNKClhQXnTUhqKY="; }; postPatch = '' diff --git a/pkgs/by-name/ve/verilator/package.nix b/pkgs/by-name/ve/verilator/package.nix index 6447dcf6ce70..6e416d440fad 100644 --- a/pkgs/by-name/ve/verilator/package.nix +++ b/pkgs/by-name/ve/verilator/package.nix @@ -21,10 +21,6 @@ stdenv.mkDerivation (finalAttrs: { pname = "verilator"; version = "5.044"; - # Verilator gets the version from this environment variable - # if it can't do git describe while building. - VERILATOR_SRC_VERSION = "v${finalAttrs.version}"; - src = fetchFromGitHub { owner = "verilator"; repo = "verilator"; @@ -88,6 +84,10 @@ stdenv.mkDerivation (finalAttrs: { ''; env = { + # Verilator gets the version from this environment variable + # if it can't do git describe while building. + VERILATOR_SRC_VERSION = "v${finalAttrs.version}"; + SYSTEMC_INCLUDE = "${lib.getDev systemc}/include"; SYSTEMC_LIBDIR = "${lib.getLib systemc}/lib"; }; diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix index 95aa9ae31cc6..2e2d5d55d79e 100644 --- a/pkgs/by-name/ve/versatiles/package.nix +++ b/pkgs/by-name/ve/versatiles/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "versatiles"; - version = "3.5.0"; + version = "3.6.2"; src = fetchFromGitHub { owner = "versatiles-org"; repo = "versatiles-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-bxrx+gjJbOzDvD6/Ov3vGCvDL6x5/tEo1+qFIWl7tTI="; + hash = "sha256-OK+rcnWxr1s4kGsXJ8u1WK7VWzfGO7LhD/HYg9Cy1u8="; }; - cargoHash = "sha256-SN1+ujgaS/lfN/CyTOVwDft8MypdYfnz1LiJE7FtQ2s="; + cargoHash = "sha256-/8Nnau4zkEY6oTYh08/XiN2rQ5M/bTMYyZTVD6UjAgU="; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/vu/vulnix/package.nix b/pkgs/by-name/vu/vulnix/package.nix index 89f6aa84ec05..f51566af6c01 100644 --- a/pkgs/by-name/vu/vulnix/package.nix +++ b/pkgs/by-name/vu/vulnix/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "vulnix"; - version = "1.12.2"; + version = "1.12.3"; format = "setuptools"; src = fetchFromGitHub { owner = "nix-community"; repo = "vulnix"; tag = finalAttrs.version; - hash = "sha256-RHYiwIWV7gf4Ty70ECY3RLouNZAEG5uxjq0+K4LK5QU="; + hash = "sha256-q6Mktt9tuX4uDk3hNvDT1928tf+Kb6gBIgwy7w2N8nk="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/wa/waylyrics/package.nix b/pkgs/by-name/wa/waylyrics/package.nix index 7bee7abea79e..b0fab4b9a6f6 100644 --- a/pkgs/by-name/wa/waylyrics/package.nix +++ b/pkgs/by-name/wa/waylyrics/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=tests::netease_lyric::get_netease_lyric" # Requires network access ]; - WAYLYRICS_THEME_PRESETS_DIR = "${placeholder "out"}/share/waylyrics/themes"; + env.WAYLYRICS_THEME_PRESETS_DIR = "${placeholder "out"}/share/waylyrics/themes"; postInstall = '' # Install themes diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxGTK31/package.nix index 96d93fe3e942..17b1d60e360f 100644 --- a/pkgs/by-name/wx/wxGTK31/package.nix +++ b/pkgs/by-name/wx/wxGTK31/package.nix @@ -89,9 +89,12 @@ stdenv.mkDerivation (finalAttrs: { "--enable-webviewwebkit" ]; - SEARCH_LIB = lib.optionalString ( - !stdenv.hostPlatform.isDarwin - ) "${libGLU.out}/lib ${libGL.out}/lib "; + env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { + SEARCH_LIB = toString [ + "${libGLU.out}/lib" + "${libGL.out}/lib" + ]; + }; preConfigure = '' substituteInPlace configure --replace \ diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix index 2dfffacec6a9..9a23dae9ff16 100644 --- a/pkgs/by-name/wx/wxGTK32/package.nix +++ b/pkgs/by-name/wx/wxGTK32/package.nix @@ -114,9 +114,12 @@ stdenv.mkDerivation (finalAttrs: { "--enable-webviewwebkit" ]; - SEARCH_LIB = lib.optionalString ( - !stdenv.hostPlatform.isDarwin - ) "${libGLU.out}/lib ${libGL.out}/lib"; + env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { + SEARCH_LIB = toString [ + "${libGLU.out}/lib" + "${libGL.out}/lib" + ]; + }; preConfigure = '' cp -r ${catch}/* 3rdparty/catch/ diff --git a/pkgs/by-name/wx/wxwidgets_3_3/package.nix b/pkgs/by-name/wx/wxwidgets_3_3/package.nix index 10e67f63b2c4..12b14092964d 100644 --- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix +++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix @@ -99,9 +99,12 @@ stdenv.mkDerivation (finalAttrs: { "--enable-webviewwebkit" ]; - SEARCH_LIB = lib.optionalString ( - !stdenv.hostPlatform.isDarwin - ) "${libGLU.out}/lib ${libGL.out}/lib"; + env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { + SEARCH_LIB = toString [ + "${libGLU.out}/lib" + "${libGL.out}/lib" + ]; + }; postInstall = " pushd $out/include diff --git a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix index 60bf09b081f3..96d448283b3c 100644 --- a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix +++ b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix @@ -6,11 +6,11 @@ buildGoModule rec { pname = "zabbix-agent2-plugin-postgresql"; - version = "7.4.6"; + version = "7.4.7"; src = fetchurl { url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${version}.tar.gz"; - hash = "sha256-rUv75kA/jU1fF1qWWkdRiAJVBWFD+78+YP/ovghtcxA="; + hash = "sha256-Ks7uV6odjvJVkCLrQb6FNDqaIzcCDV4eoInRiPZ4omo="; }; vendorHash = null; diff --git a/pkgs/by-name/ze/zeno/package.nix b/pkgs/by-name/ze/zeno/package.nix index 3bfb4abca608..0ba903bcc2b0 100644 --- a/pkgs/by-name/ze/zeno/package.nix +++ b/pkgs/by-name/ze/zeno/package.nix @@ -5,16 +5,16 @@ }: buildGoModule (finalAttrs: { pname = "zeno"; - version = "2.0.20"; + version = "2.0.21"; src = fetchFromGitHub { owner = "internetarchive"; repo = "Zeno"; tag = "v${finalAttrs.version}"; - hash = "sha256-yW9UwEvJxc6k0ggZwibfWXMoJEE9EfmU8VdP5gwH97U="; + hash = "sha256-cz65oZeCFmyepktYnIfuylyRS7T2/hRb37A7xH6xPdI="; }; - vendorHash = "sha256-vColnYyyYtDtRoAyn4Bc713U8+UoI+HY8LzmJrHUZoE="; + vendorHash = "sha256-NlHbERpHouIwzjoK1JKl+9zca0OByGqI86/62ft2oC8="; env.CGO_ENABLED = true; ldFlags = [ diff --git a/pkgs/by-name/zs/zsh-abbr/package.nix b/pkgs/by-name/zs/zsh-abbr/package.nix index 1ee2dc5cdc4b..a52bbe107a9b 100644 --- a/pkgs/by-name/zs/zsh-abbr/package.nix +++ b/pkgs/by-name/zs/zsh-abbr/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "zsh-abbr"; - version = "6.5.0"; + version = "6.5.2"; src = fetchFromGitHub { owner = "olets"; repo = "zsh-abbr"; tag = "v${version}"; - hash = "sha256-GjqVEPofJhUwyVegj0sm7tGfYdpAUyz2dM59nImRc+E="; + hash = "sha256-T5dnlPXsGdFjdASAAYrV9Kc38Y+q0iM2StgNj4efVj4="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/gcc/common/meta.nix b/pkgs/development/compilers/gcc/common/meta.nix index e0325feafbe8..cf6b3447231e 100644 --- a/pkgs/development/compilers/gcc/common/meta.nix +++ b/pkgs/development/compilers/gcc/common/meta.nix @@ -30,5 +30,5 @@ in teams = [ teams.gcc ]; mainProgram = "${targetPrefix}gcc"; - identifiers.cpeParts.vendor = "gnu"; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" version; } diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index a9ee0a7ff4d1..1ea7c1b3a953 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -594,6 +594,10 @@ stdenv.mkDerivation ( widely used in academic research. Code in the LLVM project is licensed under the "Apache 2.0 License with LLVM exceptions". ''; + identifiers.cpeParts = llvm_meta.identifiers.cpeParts // { + inherit version; + update = "*"; + }; }; } // lib.optionalAttrs enableManpages { diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index a19aac53d5de..382cb2fa6cfd 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { tk-8_5 ]; - TK_LIBRARY = "${tk-8_5}/lib/tk8.5"; + env.TK_LIBRARY = "${tk-8_5}/lib/tk8.5"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index 9305fa351d17..be4fbcd6cdde 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://savannah.nongnu.org/projects/acl"; description = "Library and tools for manipulating access control lists"; license = lib.licenses.gpl2Plus; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "acl_project" version; }; } diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index cc34c00e92a7..0c8897ef0160 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; badPlatforms = lib.platforms.microblaze; license = lib.licenses.gpl2Plus; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "attr_project" version; }; } diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 987c8dd7f199..b62bac16e287 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -216,5 +216,6 @@ in meta = (previousAttrs.meta or { }) // { description = "GNU C Library"; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" previousAttrs.passthru.minorRelease; }; }) diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/pkgs/development/perl-modules/Po4a/default.nix index 9974cc217752..6639905058ba 100644 --- a/pkgs/development/perl-modules/Po4a/default.nix +++ b/pkgs/development/perl-modules/Po4a/default.nix @@ -85,8 +85,10 @@ buildPerlPackage rec { buildInputs = [ bash ]; - LC_ALL = "en_US.UTF-8"; - SGML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; + env = { + LC_ALL = "en_US.UTF-8"; + SGML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; + }; preConfigure = '' touch Makefile.PL diff --git a/pkgs/development/python-modules/airpatrol/default.nix b/pkgs/development/python-modules/airpatrol/default.nix new file mode 100644 index 000000000000..f6531bd0d668 --- /dev/null +++ b/pkgs/development/python-modules/airpatrol/default.nix @@ -0,0 +1,40 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pytest-asyncio, + setuptools, +}: + +buildPythonPackage rec { + pname = "airpatrol"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "antondalgren"; + repo = "airpatrol"; + tag = "v${version}"; + hash = "sha256-KPch1GsJ5my43d9SVpwGA2EmrkmeBGJWAkY51rDofTk="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ "airpatrol" ]; + + meta = { + description = "Python package for interacting with AirPatrol devices"; + homepage = "https://github.com/antondalgren/airpatrol"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jamiemagee ]; + }; +} diff --git a/pkgs/development/python-modules/asyncsleepiq/default.nix b/pkgs/development/python-modules/asyncsleepiq/default.nix index cf2cc84ac1ed..4f225085efe6 100644 --- a/pkgs/development/python-modules/asyncsleepiq/default.nix +++ b/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "asyncsleepiq"; - version = "1.6.1"; + version = "1.7.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1BQYO8Nr/pvV6fz3J+340nEZhbbfFp5rytdgRAyRr0o="; + hash = "sha256-7lI60Nc5gLIjs5bEG5bQVw3Vhj9Xq6cghVZVHm8WRGg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-resource-deployments/default.nix b/pkgs/development/python-modules/azure-mgmt-resource-deployments/default.nix index 20d41be0f289..27dec75acb88 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource-deployments/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource-deployments/default.nix @@ -34,7 +34,8 @@ buildPythonPackage rec { doCheck = false; pythonNamespaces = [ - "azure.mgmt.resource.deployments" + "azure.mgmt" + "azure.mgmt.resource" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/azure-mgmt-resource-deploymentscripts/default.nix b/pkgs/development/python-modules/azure-mgmt-resource-deploymentscripts/default.nix index 5c04749ea59f..722aace9cc8f 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource-deploymentscripts/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource-deploymentscripts/default.nix @@ -34,7 +34,8 @@ buildPythonPackage rec { doCheck = false; pythonNamespaces = [ - "azure.mgmt.resource.deploymentscripts" + "azure.mgmt" + "azure.mgmt.resource" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/azure-mgmt-resource-deploymentstacks/default.nix b/pkgs/development/python-modules/azure-mgmt-resource-deploymentstacks/default.nix index 4da8dd3b756c..6b7c2065c2c9 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource-deploymentstacks/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource-deploymentstacks/default.nix @@ -34,7 +34,8 @@ buildPythonPackage rec { doCheck = false; pythonNamespaces = [ - "azure.mgmt.resource.deploymentstacks" + "azure.mgmt" + "azure.mgmt.resource" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/azure-mgmt-resource-templatespecs/default.nix b/pkgs/development/python-modules/azure-mgmt-resource-templatespecs/default.nix index 38a193ecde39..62dedac6bf64 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource-templatespecs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource-templatespecs/default.nix @@ -34,7 +34,8 @@ buildPythonPackage rec { doCheck = false; pythonNamespaces = [ - "azure.mgmt.resource.templatespecs" + "azure.mgmt" + "azure.mgmt.resource" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/onnx-asr/default.nix b/pkgs/development/python-modules/onnx-asr/default.nix new file mode 100644 index 000000000000..dfd75018eea5 --- /dev/null +++ b/pkgs/development/python-modules/onnx-asr/default.nix @@ -0,0 +1,83 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + hatch-vcs, + + # build-time deps for the custom hatch build hook that generates + # ONNX preprocessor models (listed in pyproject.toml [dependency-groups] build) + numpy, + onnx, + onnxscript, + torch, + torchaudio, + + # dependencies + onnxruntime, + + # optional-dependencies + huggingface-hub, +}: + +buildPythonPackage (finalAttrs: { + pname = "onnx-asr"; + version = "0.10.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "istupakov"; + repo = "onnx-asr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KumdelY9oNMAEBSGVdvbBH6SYi93n2cA/eEqaE8MmIU="; + }; + + build-system = [ + hatchling + hatch-vcs + # The custom hatch build hook (hatch_build.py) generates ONNX preprocessor + # models at build time using these dependencies. + numpy + onnx + onnxscript + torch + torchaudio + ]; + + dependencies = [ + numpy + onnxruntime + ]; + + optional-dependencies = { + cpu = [ + onnxruntime + ]; + hub = [ + huggingface-hub + ]; + # gpu extra installs onnxruntime-gpu; in nixpkgs users should use + # onnxruntime built with cudaSupport instead + gpu = [ + onnxruntime + ]; + }; + + # Most tests require downloading models from Hugging Face + doCheck = false; + + pythonImportsCheck = [ + "onnx_asr" + ]; + + meta = { + description = "Lightweight Automatic Speech Recognition using ONNX models"; + homepage = "https://github.com/istupakov/onnx-asr"; + changelog = "https://github.com/istupakov/onnx-asr/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + mainProgram = "onnx-asr"; + maintainers = with lib.maintainers; [ jaredmontoya ]; + }; +}) diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index a0f03b93ba4e..cca52eddec41 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -15,7 +15,6 @@ stdenv, stestr, stevedore, - writeText, }: buildPythonPackage rec { @@ -30,11 +29,9 @@ buildPythonPackage rec { hash = "sha256-1mMON/aVJon7t/zfYVhFpuB78b+DmOEVhvIFaTBRqfo="; }; - postPatch = '' - # TODO: somehow bring this to upstreams attention - substituteInPlace pyproject.toml \ - --replace-fail '"osc_lib"' '"osc_lib", "osc_lib.api", "osc_lib.cli", "osc_lib.command", "osc_lib.test", "osc_lib.tests", "osc_lib.tests.api", "osc_lib.tests.cli", "osc_lib.tests.command", "osc_lib.tests.utils", "osc_lib.utils"' - ''; + patches = [ + ./fix-pyproject.diff + ]; env.PBR_VERSION = version; @@ -79,7 +76,19 @@ buildPythonPackage rec { runHook postCheck ''; - pythonImportsCheck = [ "osc_lib" ]; + pythonImportsCheck = [ + "osc_lib" + "osc_lib.api" + "osc_lib.cli" + "osc_lib.command" + "osc_lib.test" + "osc_lib.tests" + "osc_lib.tests.api" + "osc_lib.tests.cli" + "osc_lib.tests.command" + "osc_lib.tests.utils" + "osc_lib.utils" + ]; meta = { description = "OpenStackClient Library"; diff --git a/pkgs/development/python-modules/osc-lib/fix-pyproject.diff b/pkgs/development/python-modules/osc-lib/fix-pyproject.diff new file mode 100644 index 000000000000..3fd734b7c303 --- /dev/null +++ b/pkgs/development/python-modules/osc-lib/fix-pyproject.diff @@ -0,0 +1,18 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 34680b2..95f573c 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -37,10 +37,9 @@ test = [ + "testtools>=2.2.0", # MIT + ] + +-[tool.setuptools] +-packages = [ +- "osc_lib" +-] ++[tool.setuptools.packages.find] ++where = ["."] ++include = ["osc_lib*"] + + [tool.mypy] + show_column_numbers = true diff --git a/pkgs/development/python-modules/semgrep/default.nix b/pkgs/development/python-modules/semgrep/default.nix index c86bbe502701..8f1bc81e0b2e 100644 --- a/pkgs/development/python-modules/semgrep/default.nix +++ b/pkgs/development/python-modules/semgrep/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { # tell cli/setup.py to not copy semgrep-core into the result # this means we can share a copy of semgrep-core and avoid an issue where it # copies the binary but doesn't retain the executable bit - SEMGREP_SKIP_BIN = true; + env.SEMGREP_SKIP_BIN = true; pythonRelaxDeps = [ "boltons" diff --git a/pkgs/development/python-modules/viaggiatreno-ha/default.nix b/pkgs/development/python-modules/viaggiatreno-ha/default.nix new file mode 100644 index 000000000000..110a99362d0b --- /dev/null +++ b/pkgs/development/python-modules/viaggiatreno-ha/default.nix @@ -0,0 +1,44 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "viaggiatreno-ha"; + version = "0.2.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "monga"; + repo = "viaggiatreno_ha"; + tag = "v${version}"; + hash = "sha256-XmZVguuZK4pnAqINBWJbyAa5VesrQS6wP1jNPdWqhiQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + preCheck = '' + cd tests + ''; + + # Tests use aiohttp's AioHTTPTestCase which starts a local TCP server + __darwinAllowLocalNetworking = true; + + pythonImportsCheck = [ "viaggiatreno_ha" ]; + + meta = { + changelog = "https://github.com/monga/viaggiatreno_ha/releases/tag/${src.tag}"; + description = "Viaggiatreno API wrapper to use with Home Assistant"; + homepage = "https://github.com/monga/viaggiatreno_ha"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/development/python-modules/visionpluspython/default.nix b/pkgs/development/python-modules/visionpluspython/default.nix new file mode 100644 index 000000000000..f897598459f3 --- /dev/null +++ b/pkgs/development/python-modules/visionpluspython/default.nix @@ -0,0 +1,38 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchPypi, + pyjwt, + setuptools, +}: + +buildPythonPackage rec { + pname = "visionpluspython"; + version = "1.0.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-9tHjRWMVxi1diPlKGPXLRgi5rkuAXskStUBIqfO0oh4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + pyjwt + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "visionpluspython" ]; + + meta = { + description = "Python API wrapper for Watts Vision+ smart home system"; + homepage = "https://github.com/Watts-Digital/visionpluspython"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jamiemagee ]; + }; +} diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 55b712640b80..f90d0201e766 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, + newScope, fetchFromGitHub, fetchFromGitLab, fetchFromSourcehut, + fetchFromCodeberg, nix-update-script, - runCommand, which, rustPlatform, emscripten, @@ -56,6 +57,7 @@ let fetchFromGitHub fetchFromGitLab fetchFromSourcehut + fetchFromCodeberg ; }; @@ -69,6 +71,14 @@ let */ builtGrammars = lib.mapAttrs (_: lib.makeOverridable buildGrammar) grammars; + /** + # Extensible package set for tree-sitter grammars. + # Provides .override and .extend for customization. + # Note: Use builtGrammars (not this) when iterating over grammars, + # as this includes package set functions alongside derivations + */ + grammarsScope = lib.makeScope newScope (self: builtGrammars); + # Usage: # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ]) # @@ -184,6 +194,7 @@ rustPlatform.buildRustPackage (finalAttrs: { grammars buildGrammar builtGrammars + grammarsScope withPlugins allGrammars ; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 144799432473..fc24c92a96e7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -3,6 +3,7 @@ fetchFromGitHub, fetchFromGitLab, fetchFromSourcehut, + fetchFromCodeberg, nix-update-script, }: @@ -74,6 +75,7 @@ lib.mapAttrs' ( github = fetchFromGitHub; gitlab = fetchFromGitLab; sourcehut = fetchFromSourcehut; + codeberg = fetchFromCodeberg; # NOTE: include other types here as required }; in diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix index 876fd5d7fb3e..e1050be26b56 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix @@ -1,6 +1,84 @@ { lib }: { + + ada = { + version = "0.9.0"; + url = "github:briot/tree-sitter-ada/0a4c27dc1308a9d2742de22e5fcfc0c137b3d3f3"; + hash = "sha256-K5JJjDQwHuHZ6oQaLwJHYJxmFpR+4ENEeiZO2Q0gsk4="; + }; + + adl = { + version = "0-unstable-2024-04-03"; + url = "github:adl-lang/tree-sitter-adl/2787d04beadfbe154d3f2da6e98dc45a1b134bbf"; + hash = "sha256-gYEtTjjy8qClYg4+ZnKwNUWMxKTc3sUXQdsVCwB7H6w="; + meta = { + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + agda = { + version = "1.3.3"; + url = "github:tree-sitter/tree-sitter-agda"; + hash = "sha256-kE35Y4quEnBdub1Wd7sdws7yhR6UFhyhk6Gw2CkI0Ng="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + alloy = { + version = "0-unstable-2024-11-29"; + url = "github:mattsre/tree-sitter-alloy/58d462b1cdb077682b130caa324f3822aeb00b8e"; + hash = "sha256-yDYGtM/vlZqeOy2O+scGHc6Dae0H/cXyC6Gu0inwJNA="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + amber = { + version = "0-unstable-2025-11-26"; + url = "github:amber-lang/tree-sitter-amber/107c6d4a420fb0c5962b62ebd9347b7eb0015957"; + hash = "sha256-vEEjHg/qRFfgA8AEWP7hp28/rxBCjPTvxLSMnvlXyi8="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + astro = { + version = "0-unstable-2025-04-23"; + url = "github:virchau13/tree-sitter-astro/213f6e6973d9b456c6e50e86f19f66877e7ef0ee"; + hash = "sha256-TpXs3jbYn39EHxTdtSfR7wLA1L8v9uyK/ATPp5v4WqE="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + awk = { + version = "0-unstable-2024-11-02"; + url = "github:Beaglefoot/tree-sitter-awk/34bbdc7cce8e803096f47b625979e34c1be38127"; + hash = "sha256-MDfAtG6ZC0KttJ5bdW71Jgts+SAJitRnwu8xQ26N9K0="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + bash = { version = "0.25.1"; url = "github:tree-sitter/tree-sitter-bash"; @@ -10,6 +88,18 @@ }; }; + bass = { + version = "0-unstable-2024-05-03"; + url = "github:vito/tree-sitter-bass/28dc7059722be090d04cd751aed915b2fee2f89a"; + hash = "sha256-NKu60BbTKLsYQRtfEoqGQUKERJFnmZNVJE6HBz/BRIM="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + beancount = { version = "2.5.0"; url = "github:polarmutex/tree-sitter-beancount"; @@ -28,6 +118,18 @@ }; }; + bicep = { + version = "0-unstable-2024-12-22"; + url = "github:tree-sitter-grammars/tree-sitter-bicep/bff59884307c0ab009bd5e81afd9324b46a6c0f9"; + hash = "sha256-+qvhJgYqs8aj/Kmojr7lmjbXmskwVvbYBn4ia9wOv3k="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + bitbake = { version = "1.1.0"; url = "github:tree-sitter-grammars/tree-sitter-bitbake"; @@ -37,6 +139,30 @@ }; }; + blade = { + version = "0-unstable-2025-08-25"; + url = "github:EmranMR/tree-sitter-blade/cc764dadcbbceb3f259396fef66f970c72e94f96"; + hash = "sha256-3/gY68F+xOF5Fv6rK9cEIJCVDzg/3ap1/gzkEacGuy4="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + blueprint = { + version = "0-unstable-2025-06-17"; + url = "github:smrtrfszm/tree-sitter-blueprint/de66f283c6c9b7c270d766c2e4cf95535650ec48"; + hash = "sha256-zmMJZAxyKO42gIK3cWP/LuoPIo2+xr6fEDeHXknqa7M="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + bqn = { version = "0.3.2"; url = "github:shnarazk/tree-sitter-bqn"; @@ -46,6 +172,12 @@ }; }; + c = { + version = "0.24.1"; + url = "github:tree-sitter/tree-sitter-c"; + hash = "sha256-gmzbdwvrKSo6C1fqTJFGxy8x0+T+vUTswm7F5sojzKc="; + }; + c-sharp = { version = "0.23.1"; url = "github:tree-sitter/tree-sitter-c-sharp"; @@ -55,12 +187,75 @@ }; }; - c = { - version = "0.24.1"; - url = "github:tree-sitter/tree-sitter-c"; - hash = "sha256-gmzbdwvrKSo6C1fqTJFGxy8x0+T+vUTswm7F5sojzKc="; + caddyfile = { + version = "0-unstable-2025-12-16"; + url = "github:caddyserver/tree-sitter-caddyfile/2b816940b5bf4f86c650aded24500cb5b682f1a1"; + hash = "sha256-C/dTDm4X+VxtNZaqb2AHgcDZyGeBN9VMwZjSzJVEHGo="; meta = { license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + cairo = { + version = "0-unstable-2025-09-14"; + url = "github:starkware-libs/tree-sitter-cairo/8dcd77dbe7f68b2cc661031dff224dfc17bdbaf4"; + hash = "sha256-RzxmMV0Uo4N25QuhMaTJHCA0sLE/51cfhd25LYFlFog="; + meta = { + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + capnp = { + version = "0-unstable-2024-04-20"; + url = "github:amaanq/tree-sitter-capnp/7b0883c03e5edd34ef7bcf703194204299d7099f"; + hash = "sha256-WKrZuOMxmdGlvUI9y8JgwCNMdJ8MULucMhkmW8JCiXM="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + cel = { + version = "0-unstable-2024-02-13"; + url = "github:bufbuild/tree-sitter-cel/df0585025e6f50cdb07347f5009ae3f47c652890"; + hash = "sha256-Fyq56kzu1bL44QhrF3ZnKWgsoPRh3tjTRi2CynNQGfw="; + meta = { + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + circom = { + version = "0-unstable-2024-09-09"; + url = "github:Decurity/tree-sitter-circom/02150524228b1e6afef96949f2d6b7cc0aaf999e"; + hash = "sha256-wosqwiDkK1rytGWMJApz1M42Sme9OaWXC0rmj7vM4g8="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + clarity = { + version = "0-unstable-2025-11-17"; + url = "github:xlittlerag/tree-sitter-clarity/cbb3ffe8688aca558286fd45ed46857a1f3207bb"; + hash = "sha256-iylkAIBEpMPzRYHXyFQKMIEZJbqij/8tLdq9z/UPgN8="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; }; }; @@ -100,6 +295,18 @@ }; }; + cpon = { + version = "0-unstable-2023-06-06"; + url = "github:fvacek/tree-sitter-cpon/d42786f6295db7046372c042b208b8094940e9cd"; + hash = "sha256-5Va7cnbumCQDNAhrYe2dCBhFmgZUQ6dCy4VjB4+JaTs="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + cpp = { version = "0.23.4"; url = "github:tree-sitter/tree-sitter-cpp"; @@ -127,6 +334,18 @@ }; }; + csv = { + version = "0-unstable-2025-03-13"; + url = "github:weartist/rainbow-csv-tree-sitter/fbf125bcedb15080980e8afaf69c4374412e5844"; + hash = "sha256-caWf6cIx0CcDP2u84ncfdTSlWvhVawnYAIW4m5bzRQY="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + cuda = { version = "0.21.1"; url = "github:tree-sitter-grammars/tree-sitter-cuda"; @@ -145,6 +364,30 @@ }; }; + cylc = { + version = "0-unstable-2025-09-08"; + url = "github:elliotfontaine/tree-sitter-cylc/6d1d81137112299324b526477ce1db989ab58fb8"; + hash = "sha256-jgQCTM36S8UwSyT4LAfcX4DUIl2OYVMeQdDg3zRrw00="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + d = { + version = "0-unstable-2025-06-29"; + url = "github:gdamore/tree-sitter-d/fb028c8f14f4188286c2eef143f105def6fbf24f"; + hash = "sha256-Xi8out5j4L5pAArA9zmLA7aGhma++G+AaVLgFW+TEAo="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + dart = { version = "0-unstable-2025-10-04"; url = "github:usernobody14/tree-sitter-dart/d4d8f3e337d8be23be27ffc35a0aef972343cd54"; @@ -154,6 +397,30 @@ }; }; + dbml = { + version = "0-unstable-2023-11-02"; + url = "github:dynamotn/tree-sitter-dbml/2e2fa5640268c33c3d3f27f7e676f631a9c68fd9"; + hash = "sha256-IxxUW6YYxP1hkwA9NEojEEE3c8pwvAI6juX8aF7NfMw="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + debian = { + version = "0-unstable-2025-04-01"; + url = "gitlab:MggMuggins/tree-sitter-debian/9b3f4b78c45aab8a2f25a5f9e7bbc00995bc3dde"; + hash = "sha256-VjWoF5oI+K101xKvF+MDsy1+eCkkUytn39PHKqOCkjo="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + devicetree = { version = "0.11.1"; url = "github:joelspadin/tree-sitter-devicetree"; @@ -163,6 +430,42 @@ }; }; + dhall = { + version = "0-unstable-2025-04-13"; + url = "github:jbellerb/tree-sitter-dhall/62013259b26ac210d5de1abf64cf1b047ef88000"; + hash = "sha256-4xbz7DDUlLGgLW5V6Yyvo7dkE9MOk3mCQEBTYyRbNuM="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + diff = { + version = "0-unstable-2025-10-29"; + url = "github:the-mikedavis/tree-sitter-diff/2520c3f934b3179bb540d23e0ef45f75304b5fed"; + hash = "sha256-8rYLNGgoZSvvfqO2++nAgFKmvbkKJ3m+9B8bTXp6Us4="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + djot = { + version = "0-unstable-2025-09-15"; + url = "github:treeman/tree-sitter-djot/74fac1f53c6d52aeac104b6874e5506be6d0cfe6"; + hash = "sha256-HfEZHNhxEbH07gDzLPdl6n2Pf//o8tbJvwE+tesJDC8="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + dockerfile = { version = "0.2.0"; url = "github:camdencheek/tree-sitter-dockerfile"; @@ -181,6 +484,30 @@ }; }; + dtd = { + version = "0-unstable-2023-04-07"; + url = "github:KMikeeU/tree-sitter-dtd/6116becb02a6b8e9588ef73d300a9ba4622e156f"; + hash = "sha256-mq617pfH/Na9JB8SDEudxbKJfaoezgjC3xVOIOZ8Qb8="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + dunstrc = { + version = "0-unstable-2025-05-04"; + url = "github:rotmh/tree-sitter-dunstrc/9cb9d5cc51cf5e2a47bb2a0e2f2e519ff11c1431"; + hash = "sha256-yfjOly1NvdNIFc3zzFb8XSCA+IW9uIzjtQRhf4/NQzY="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + earthfile = { version = "0.6.0-unstable-2025-10-27"; url = "github:glehmann/tree-sitter-earthfile/5baef88717ad0156fd29a8b12d0d8245bb1096a8"; @@ -190,6 +517,18 @@ }; }; + edoc = { + version = "0-unstable-2022-11-23"; + url = "github:the-mikedavis/tree-sitter-edoc/74774af7b45dd9cefbf9510328fc6ff2374afc50"; + hash = "sha256-ALGr1vI/R2gAgjHfwORYMP/+CeIejnSGqC9Db+GD5uM="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + eex = { version = "0.1.0"; url = "github:connorlay/tree-sitter-eex"; @@ -226,6 +565,18 @@ }; }; + elvish = { + version = "0-unstable-2023-07-17"; + url = "github:ckafi/tree-sitter-elvish/5e7210d945425b77f82cbaebc5af4dd3e1ad40f5"; + hash = "sha256-POuQA2Ihi+qDYQ5Pv7hBAzHpPu/FcnuYscW4ItDOCZg="; + meta = { + license = lib.licenses.bsd0; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + embedded-template = { version = "0.25.0"; url = "github:tree-sitter/tree-sitter-embedded-template"; @@ -244,6 +595,18 @@ }; }; + esdl = { + version = "0-unstable-2024-03-28"; + url = "github:greym0uth/tree-sitter-esdl/7e6692b2e2b4f73b03f1371e8d8b83f23bc1c6c8"; + hash = "sha256-8vBpWfRl0yd0Tcsgq+wzcrajGbNJMc7qSq+YH/8A0cU="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + factor = { version = "0-unstable-2025-01-12"; url = "github:erochest/tree-sitter-factor/554d8b705df61864eb41a0ecf3741e94eb9f0c54"; @@ -262,6 +625,30 @@ }; }; + fga = { + version = "0-unstable-2025-12-17"; + url = "github:matoous/tree-sitter-fga/e763d12cfd8569494215f304bc2b0074c84709e9"; + hash = "sha256-d1gvEoJosBcEiq4fxb+1LFcdSkuOWGXyG1cC44Lo19o="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + fidl = { + version = "0-unstable-2024-02-27"; + url = "github:google/tree-sitter-fidl/0a8910f293268e27ff554357c229ba172b0eaed2"; + hash = "sha256-QFAkxQo2w/+OR7nZn9ldBk2yHOd23kzciAcQvIZ5hrY="; + meta = { + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + fish = rec { version = "3.6.0"; url = "github:ram02z/tree-sitter-fish?ref=${version}"; @@ -271,6 +658,18 @@ }; }; + forth = { + version = "0-unstable-2025-12-01"; + url = "github:alexanderbrevig/tree-sitter-forth/360ef13f8c609ec6d2e80782af69958b84e36cd0"; + hash = "sha256-d7X1Ubd9tKMQgNHlH+sQxmcsgLWB4mxR5CIdyKkLnM8="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + fortran = { version = "0.5.1"; url = "github:stadelmanma/tree-sitter-fortran"; @@ -280,6 +679,30 @@ }; }; + fsharp = { + version = "0-unstable-2025-07-05"; + url = "github:ionide/tree-sitter-fsharp/5141851c278a99958469eb1736c7afc4ec738e47"; + hash = "sha256-cJpbO9PjGtJu4RCDsmQ0qjys765/z397y/wbfGxTY9Y="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + gas = { + version = "0-unstable-2023-09-15"; + url = "github:sirius94/tree-sitter-gas/60f443646b20edee3b7bf18f3a4fb91dc214259a"; + hash = "sha256-HyLNnmK4jud2Ndkc+5MY9MlASh/ehPA/eQATsCVGcUw="; + meta = { + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + gdscript = { version = "6.0.0"; url = "github:prestonknopp/tree-sitter-gdscript"; @@ -298,6 +721,90 @@ }; }; + gherkin = { + version = "0-unstable-2024-07-04"; + url = "github:SamyAB/tree-sitter-gherkin/43873ee8de16476635b48d52c46f5b6407cb5c09"; + hash = "sha256-6Ywu4HPfgpKsuZ6wo2b1CA3Z+lD+/3XEyJi2l2Q66+Y="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + ghostty = { + version = "0-unstable-2025-11-27"; + url = "github:bezhermoso/tree-sitter-ghostty/c2f7af6d7250f63f01401a6d84b3e353e71ff3c3"; + hash = "sha256-d9cJWhEHiAMxyNhUt7VR5IU5z/5oXn3m9aMsknexaNM="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + git-config = { + version = "0-unstable-2025-05-11"; + url = "github:the-mikedavis/tree-sitter-git-config/0fbc9f99d5a28865f9de8427fb0672d66f9d83a5"; + hash = "sha256-u1NrtCap+CvhSW4q7xrwiUPGuCspjk9sHKkXQcEXc2E="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + git-rebase = { + version = "0-unstable-2024-07-22"; + url = "github:the-mikedavis/tree-sitter-git-rebase/bff4b66b44b020d918d67e2828eada1974a966aa"; + hash = "sha256-k4C7dJUkvQxIxcaoVmG2cBs/CeYzVqrip2+2mRvHtZc="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + gitattributes = { + version = "0-unstable-2022-05-06"; + url = "github:mtoohey31/tree-sitter-gitattributes/deb04fdbff485310ee5bac74ddc6ab624a602b7b"; + hash = "sha256-4auPT/qeURtVMs+mi/zS4B08v0cMVkHOjSidV5FELO0="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + gitcommit = { + version = "0-unstable-2025-03-13"; + url = "github:gbprod/tree-sitter-gitcommit/a716678c0f00645fed1e6f1d0eb221481dbd6f6d"; + hash = "sha256-KYfcs99p03b0RiPYnZeKJf677fmVf658FLZcFk2v2Ws="; + meta = { + license = lib.licenses.wtfpl; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + gitignore = { + version = "0-unstable-2022-05-04"; + url = "github:shunsambongi/tree-sitter-gitignore/f4685bf11ac466dd278449bcfe5fd014e94aa504"; + hash = "sha256-MjoY1tlVZgN6JqoTjhhg0zSdHzc8yplMr8824sfIKp8="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + gleam = { version = "1.1.0"; url = "github:gleam-lang/tree-sitter-gleam"; @@ -325,12 +832,15 @@ }; }; - go-template = { - version = "0-unstable-2025-12-12"; - url = "github:ngalaiko/tree-sitter-go-template/c59999dc449c29549f5735eaac31b938a13b6c14"; - hash = "sha256-YKqpNkCRLX+89Ottw4KVXxrEsIPRUsWs0UwIgucHwdo="; + gn = { + version = "0-unstable-2023-12-10"; + url = "github:willcassella/tree-sitter-gn/fbaa7b3d52b958e3ac06e15416e1785138bde063"; + hash = "sha256-3OLlUL21YcdOZcnroPMwvMVJgu8bsGHldTnZh8y6q9M="; meta = { - license = lib.licenses.mit; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + aciceri + ]; }; }; @@ -343,6 +853,12 @@ }; }; + go-template = { + version = "0-unstable-2025-12-12"; + url = "github:ngalaiko/tree-sitter-go-template/c59999dc449c29549f5735eaac31b938a13b6c14"; + hash = "sha256-YKqpNkCRLX+89Ottw4KVXxrEsIPRUsWs0UwIgucHwdo="; + }; + godot-resource = { language = "godot_resource"; version = "0.7.0"; @@ -362,6 +878,18 @@ }; }; + gotmpl = { + version = "0-unstable-2022-07-19"; + url = "github:dannylongeuay/tree-sitter-go-template/395a33e08e69f4155156f0b90138a6c86764c979"; + hash = "sha256-YlPX74tEgCxGm2GYqYvQ0ouzTZ4x5/R+hkP+lBuOLGw="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + gowork = { version = "0-unstable-2022-10-04"; url = "github:omertuc/tree-sitter-go-work/949a8a470559543857a62102c84700d291fc984c"; @@ -371,6 +899,18 @@ }; }; + gpr = { + version = "0-unstable-2024-08-13"; + url = "github:brownts/tree-sitter-gpr/cea857d3c18d1385d1f5b66cd09ea1e44173945c"; + hash = "sha256-tqff8Aaj9uebJeNYuNdaDBllsj/mwRStWhhY3zB8xlU="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + graphql = { version = "0-unstable-2021-05-10"; url = "github:bkegley/tree-sitter-graphql/5e66e961eee421786bdda8495ed1db045e06b5fe"; @@ -380,6 +920,42 @@ }; }; + gren = { + version = "0-unstable-2025-05-03"; + url = "github:MaeBrooks/tree-sitter-gren/c36aac51a915fdfcaf178128ba1e9c2205b25930"; + hash = "sha256-XtLP2ncpwAiubHug6k4sJCYRZo5f+Nu02tho/4tVD/k="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + groovy = { + version = "0-unstable-2025-01-22"; + url = "github:murtaza64/tree-sitter-groovy/86911590a8e46d71301c66468e5620d9faa5b6af"; + hash = "sha256-652wluH2C3pYmhthaj4eWDVLtEvvVIuu70bJNnt5em0="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + hare = { + version = "0-unstable-2024-07-30"; + url = "sourcehut:~ecs/tree-sitter-hare/fb6ea01461441ec7c312e64e326649f5e9011a64"; + hash = "sha256-KQ9U3XWzqS0ozTHpaLpAIvK8T8ilbV1ex6CLFzHXPzA="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + haskell = { version = "0.23.1"; url = "github:tree-sitter/tree-sitter-haskell"; @@ -389,6 +965,18 @@ }; }; + haskell-persistent = { + version = "0-unstable-2023-09-19"; + url = "github:MercuryTechnologies/tree-sitter-haskell-persistent/577259b4068b2c281c9ebf94c109bd50a74d5857"; + hash = "sha256-ASdkBQ57GfpLF8NXgDzJMB/Marz9p1q03TZkwMgF/eQ="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + hcl = { version = "1.2.0"; url = "github:tree-sitter-grammars/tree-sitter-hcl"; @@ -416,6 +1004,42 @@ }; }; + hocon = { + version = "0-unstable-2022-11-07"; + url = "github:antosha417/tree-sitter-hocon/c390f10519ae69fdb03b3e5764f5592fb6924bcc"; + hash = "sha256-9Zo3YYoo9mJ4Buyj7ofSrlZURrwstBo0vgzeTq1jMGw="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + hoon = { + version = "0-unstable-2024-12-17"; + url = "github:urbit-pilled/tree-sitter-hoon/1545137aadcc63660c47db9ad98d02fa602655d0"; + hash = "sha256-RkSPoscrinmuSTWHzXkRNaiqECDXpKAbQ4z7a6Tpvek="; + meta = { + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + hosts = { + version = "0-unstable-2022-12-01"; + url = "github:ath3/tree-sitter-hosts/301b9379ce7dfc8bdbe2c2699a6887dcb73953f9"; + hash = "sha256-f8ldDZD0I/D8IC566bZ4YgQE/b0maTE3BfzuzPfy92k="; + meta = { + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + html = { version = "0.23.2"; url = "github:tree-sitter/tree-sitter-html"; @@ -425,6 +1049,18 @@ }; }; + htmldjango = { + version = "0-unstable-2025-04-16"; + url = "github:interdependence/tree-sitter-htmldjango/3a643167ad9afac5d61e092f08ff5b054576fadf"; + hash = "sha256-sQV7olTaQ68wixzvKV44myVvDUXXjBZh9N3jvDFUSvE="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + http = { version = "3.0.0"; url = "github:rest-nvim/tree-sitter-http?ref=v3.0"; @@ -434,6 +1070,18 @@ }; }; + hurl = { + version = "0-unstable-2025-09-13"; + url = "github:pfeiferj/tree-sitter-hurl/597efbd7ce9a814bb058f48eabd055b1d1e12145"; + hash = "sha256-sQjjx3DGfi0l8/XNOIoyFYAcDpaQOkD4Ics3g6vkgjM="; + meta = { + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + hyprlang = { version = "3.1.0"; url = "github:tree-sitter-grammars/tree-sitter-hyprlang"; @@ -443,6 +1091,54 @@ }; }; + iex = { + version = "0-unstable-2022-01-08"; + url = "github:elixir-lang/tree-sitter-iex/39f20bb51f502e32058684e893c0c0b00bb2332c"; + hash = "sha256-YRVxMz9VqZ00bG0tQ/IDxf/8UkK3/OYZTIMxsQfknII="; + meta = { + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + ini = { + version = "0-unstable-2025-12-08"; + url = "github:justinmk/tree-sitter-ini/e4018b5176132b4f3c5d6e61cea383f42288d0f5"; + hash = "sha256-8WCyIaApsLPOybe+cntF4ISyQKN41L2IRAATd9KmzL0="; + meta = { + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + ink = { + version = "0-unstable-2025-02-05"; + url = "github:rhizoome/tree-sitter-ink/3bafa20b888b97a505164fa9ee3812c331b2b809"; + hash = "sha256-i+e+eaiAzTx2n9A0mlQ1SStGTbcS4LQJfmK8uNpzNiI="; + meta = { + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + inko = { + version = "0-unstable-2025-12-06"; + url = "github:inko-lang/tree-sitter-inko/20e2842680dd0d47dd2ee976bc320e4399f65fe1"; + hash = "sha256-qgB2s/ghmOGjJ+MH7p3ZQKa+RMxx58642Z9lYC1wlq4="; + meta = { + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + janet-simple = { version = "0.0.7-unstable-2025-05-19"; url = "github:sogaiu/tree-sitter-janet-simple/7e28cbf1ca061887ea43591a2898001f4245fddf"; @@ -470,6 +1166,42 @@ }; }; + jinja2 = { + version = "0-unstable-2023-02-09"; + url = "github:varpeti/tree-sitter-jinja2/a533cd3c33aea6acb0f9bf9a56f35dcfe6a8eb53"; + hash = "sha256-ksHel/kkWk4cyCx/+k8IfqjnID8i744WsZi9+AVSNpw="; + meta = { + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + jjdescription = { + version = "0-unstable-2025-02-20"; + url = "github:kareigu/tree-sitter-jjdescription/1613b8c85b6ead48464d73668f39910dcbb41911"; + hash = "sha256-HPghz3mOukXrY0KQllOR7Kkl2U3+ukPBrXWKnJCwsqI="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + jq = { + version = "0-unstable-2025-05-10"; + url = "github:flurie/tree-sitter-jq/c204e36d2c3c6fce1f57950b12cabcc24e5cc4d9"; + hash = "sha256-WEsiDsZEFTGC3s0awYE8rN/fsRML7CePKOXUbL+Fujc="; + meta = { + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + jsdoc = { version = "0.25.0"; url = "github:tree-sitter/tree-sitter-jsdoc"; @@ -551,6 +1283,18 @@ }; }; + koto = { + version = "0-unstable-2025-11-17"; + url = "github:koto-lang/tree-sitter-koto/f8b3f62c0eed185dca1559789e78759d4bee60e5"; + hash = "sha256-vv5HMDXMcSi91loIppsx/5Hu6jJ7/cedtTyahOBP780="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + latex = { version = "0.6.0"; url = "github:latex-lsp/tree-sitter-latex"; @@ -561,6 +1305,42 @@ }; }; + ld = { + version = "0-unstable-2024-04-12"; + url = "github:mtoohey31/tree-sitter-ld/0e9695ae0ede47b8744a8e2ad44d4d40c5d4e4c9"; + hash = "sha256-U+yqSO+vo1RAZrCqCojhY4HwjcjirZU/HgWDCdw3YGw="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + ldif = { + version = "0-unstable-2023-05-27"; + url = "github:kepet19/tree-sitter-ldif/0a917207f65ba3e3acfa9cda16142ee39c4c1aaa"; + hash = "sha256-xivgajrM0sqbEcX+ZN0h5C+s7KJVJanrvxRQ/j1VNIQ="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + lean = { + version = "0-unstable-2024-12-25"; + url = "github:Julian/tree-sitter-lean/efe6b87145608d12f5996bd7f0cf6095a0e82261"; + hash = "sha256-MF+LRzhDw3V/l/h11ZTyWCUCm3b+g0oyOdaCZMVlJc4="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + ledger = { version = "0-unstable-2025-05-04"; url = "github:cbarrete/tree-sitter-ledger/96c92d4908a836bf8f661166721c98439f8afb80"; @@ -579,6 +1359,42 @@ }; }; + llvm-mir = { + version = "0-unstable-2024-10-03"; + url = "github:Flakebi/tree-sitter-llvm-mir/d166ff8c5950f80b0a476956e7a0ad2f27c12505"; + hash = "sha256-ivslvFNr3550Grko9xbHPtA63XNc+twFfZQFhBmPaME="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + log = { + version = "0-unstable-2023-11-26"; + url = "github:Tudyx/tree-sitter-log/62cfe307e942af3417171243b599cc7deac5eab9"; + hash = "sha256-lvN2it+pNyYvGIqtRI+zUZwPrj/3SLMZX9zordYg3IU="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + lpf = { + version = "0-unstable-2023-10-13"; + url = "gitlab:TheZoq2/tree-sitter-lpf/db7372e60c722ca7f12ab359e57e6bf7611ab126"; + hash = "sha256-Y+W4Ceb0+gUJbBC9ziy672not6zc8JVIGTWYsPmWk7c="; + meta = { + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + lua = { version = "0.0.19-unstable-2025-05-16"; url = "github:MunifTanjim/tree-sitter-lua/4fbec840c34149b7d5fe10097c93a320ee4af053"; @@ -588,6 +1404,30 @@ }; }; + luau = { + version = "0-unstable-2025-12-08"; + url = "github:polychromatist/tree-sitter-luau/71b03e66b2c8dd04e0133c9b998a54a58f239ca4"; + hash = "sha256-aXoq9NvJDzQLSuyanFL8dQepxTyK/k5y0APAJn1DZKI="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + mail = { + version = "0-unstable-2025-04-09"; + url = "github:ficcdaf/tree-sitter-mail/c84126474aee00ce67c32229710a4e1e09827a08"; + hash = "sha256-qqy7jsqsWVUlRuk+Cv+n3sEiH/SlO5/4Q+mrcftFKP4="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + make = { version = "0-unstable-2021-12-16"; url = "github:alemuller/tree-sitter-make/a4b9187417d6be349ee5fd4b6e77b4172c6827dd"; @@ -597,6 +1437,18 @@ }; }; + markdoc = { + version = "0-unstable-2024-10-06"; + url = "github:markdoc-extra/tree-sitter-markdoc/e4211fe541a13350275e4684de79adfebe9a91f8"; + hash = "sha256-WFFrpvulhT9Z0L+zAgZQGIzcg3YxkcJpLfNeqpf3afI="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + markdown = { version = "0.5.2"; url = "github:tree-sitter-grammars/tree-sitter-markdown"; @@ -618,6 +1470,77 @@ }; }; + matlab = { + version = "0-unstable-2025-11-22"; + url = "github:acristoffers/tree-sitter-matlab/1bccabdbd420a9c3c3f96f36d7f9e65b3d9c88ef"; + hash = "sha256-V7GOXiR//JgxjTOxRi+PpfRGvunX4r3C0Bu1CrN+/K4="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + mermaid = { + version = "0-unstable-2024-04-22"; + url = "github:monaqa/tree-sitter-mermaid/90ae195b31933ceb9d079abfa8a3ad0a36fee4cc"; + hash = "sha256-Tt1bPqpL59FQzuI8CPljBmQoAfJPUkVC9Xe1GcfXzfE="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + meson = { + version = "0-unstable-2022-11-02"; + url = "github:staysail/tree-sitter-meson/1a497eecfb1b840ab12caf28f0ef45d4a5e26d28"; + hash = "sha256-VWI4q85uOzT/n/tWYAMgGWdK1q3BAAuwC4WjErE82xk="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + mojo = { + version = "0-unstable-2024-12-07"; + url = "github:lsh/tree-sitter-mojo/564d5a8489e20e5f723020ae40308888699055c0"; + hash = "sha256-UY4gTG9HI/agpD+2syb7lUqfZpw6I6UnKzs9zE9JFwA="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + move = { + version = "0-unstable-2025-06-17"; + url = "github:tzakian/tree-sitter-move/640ee15e4a7b0d09a4bc95dcc71336c28d97999b"; + hash = "sha256-rLIyJZEjMRo8am+ivKCwAESvv6jFtTPYJuuebN3T5Es="; + meta = { + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + nasm = { + version = "0-unstable-2024-11-23"; + url = "github:naclsn/tree-sitter-nasm/d1b3638d017f2a8585e26dcfc66fe1df94185e30"; + hash = "sha256-38yRvaSkHZ7iRmHlXdCssJtd/RQRfBB437HzBwWv2mg="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + netlinx = { version = "1.0.4"; url = "github:norgate-av/tree-sitter-netlinx"; @@ -627,6 +1550,18 @@ }; }; + nginx = { + version = "0-unstable-2024-10-15"; + url = "gitlab:joncoole/tree-sitter-nginx/f6d13cf6281b25f2ce342a49a41a10a0381e00f0"; + hash = "sha256-ofFBxW4p7rZFZm9w5cyA0semYLJWFu9emv8bfTfAFok="; + meta = { + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + nickel = { version = "0.5.0"; url = "github:nickel-lang/tree-sitter-nickel"; @@ -636,6 +1571,18 @@ }; }; + nim = { + version = "0-unstable-2025-07-29"; + url = "github:alaviss/tree-sitter-nim/4ad352773688deb84a95eeaa9872acda5b466439"; + hash = "sha256-dinMmbD36o1QkcLk2mgycgHZ9sW5Mg6lfnxssynaj58="; + meta = { + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + nix = { version = "0.3.0-unstable-2025-12-03"; url = "github:nix-community/tree-sitter-nix/eabf96807ea4ab6d6c7f09b671a88cd483542840"; @@ -645,15 +1592,6 @@ }; }; - norg-meta = { - version = "0.1.0"; - url = "github:nvim-neorg/tree-sitter-norg-meta"; - hash = "sha256-8qSdwHlfnjFuQF4zNdLtU2/tzDRhDZbo9K54Xxgn5+8="; - meta = { - license = lib.licenses.mit; - }; - }; - norg = { version = "0.2.6"; url = "github:nvim-neorg/tree-sitter-norg"; @@ -663,6 +1601,12 @@ }; }; + norg-meta = { + version = "0.1.0"; + url = "github:nvim-neorg/tree-sitter-norg-meta"; + hash = "sha256-8qSdwHlfnjFuQF4zNdLtU2/tzDRhDZbo9K54Xxgn5+8="; + }; + nu = { version = "0-unstable-2025-12-13"; url = "github:nushell/tree-sitter-nu/4c149627cc592560f77ead1c384e27ec85926407"; @@ -691,6 +1635,66 @@ }; }; + odin = { + version = "0-unstable-2025-01-12"; + url = "github:tree-sitter-grammars/tree-sitter-odin/d2ca8efb4487e156a60d5bd6db2598b872629403"; + hash = "sha256-aPeaGERAP1Fav2QAjZy1zXciCuUTQYrsqXaSQsYG0oU="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + ohm = { + version = "0-unstable-2025-12-12"; + url = "github:novusnota/tree-sitter-ohm/a1de3e748a185a335b446613aaeff1eb10e83cdf"; + hash = "sha256-phH6FHdP9ycVXSzsON0/IyEuqkR65/8cNxJcTOBr3JE="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + opencl = { + version = "0-unstable-2023-03-30"; + url = "github:lefp/tree-sitter-opencl/8e1d24a57066b3cd1bb9685bbc1ca9de5c1b78fb"; + hash = "sha256-tymKOBQbbXAI4bUDSOnZaMoyhFuDwSInvqgGq0eTDl8="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + openscad = { + version = "0-unstable-2025-11-25"; + url = "github:openscad/tree-sitter-openscad/09ed1478aa98a11df06367e91f2d310e334e39fb"; + hash = "sha256-tRBUGfcEdEnym1mrpPs7YdWvbBgeLQoZLgb47XtoGd8="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + org = { + version = "0-unstable-2023-06-19"; + url = "github:milisims/tree-sitter-org/64cfbc213f5a83da17632c95382a5a0a2f3357c1"; + hash = "sha256-/03eZBbv23W5s/GbDgPgaJV5TyK+/lrWUVeINRS5wtA="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + org-nvim = { version = "1.3.1-unstable-2023-06-19"; url = "github:emiasims/tree-sitter-org/64cfbc213f5a83da17632c95382a5a0a2f3357c1"; @@ -700,6 +1704,42 @@ }; }; + pascal = { + version = "0-unstable-2025-05-17"; + url = "github:Isopod/tree-sitter-pascal/5054931bcd022860dd5936864f981e359fb63aef"; + hash = "sha256-+5HzlNL54/Wdr7b1vRwZzIU3Z8vqFP9FzmEO1qwxJrk="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + passwd = { + version = "0-unstable-2022-12-01"; + url = "github:ath3/tree-sitter-passwd/20239395eacdc2e0923a7e5683ad3605aee7b716"; + hash = "sha256-3UfuyJeblQBKjqZvLYyO3GoCvYJp+DvBwQGkR3pFQQ4="; + meta = { + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + pem = { + version = "0-unstable-2023-02-05"; + url = "github:mtoohey31/tree-sitter-pem/62842ea106ff66876f9af4cccdf87913d1ed912e"; + hash = "sha256-yxxm3Iu3FQxdWM0d2VeptZj/ePTa58NFhLgYBzaeSeU="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + perl = { version = "1.1.1"; url = "github:ganezdragon/tree-sitter-perl"; @@ -709,6 +1749,18 @@ }; }; + pest = { + version = "0-unstable-2025-10-06"; + url = "github:pest-parser/tree-sitter-pest/c19629a0c50e6ca2485c3b154b1dde841a08d169"; + hash = "sha256-S5qg/LLPlMmNtRTTi7vW8y/c+zcId7ADmMqIt0gqJBo="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + pgn = { version = "1.4.3"; url = "github:rolandwalker/tree-sitter-pgn"; @@ -739,6 +1791,18 @@ }; }; + php-only = { + version = "0-unstable-2025-11-24"; + url = "github:tree-sitter/tree-sitter-php/7d07b41ce2d442ca9a90ed85d0075eccc17ae315"; + hash = "sha256-XEKlsqC7HJ3mShmcwmfpezNP9DHE8f73f7/ru4MuxEo="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + pioasm = { version = "0-unstable-2024-10-12"; url = "github:leo60228/tree-sitter-pioasm/afece58efdb30440bddd151ef1347fa8d6f744a9"; @@ -748,6 +1812,67 @@ }; }; + pkl = { + version = "0-unstable-2025-12-12"; + url = "github:apple/tree-sitter-pkl/ac58931956c000d3aeefbb55a81fc3c5bd6aecf0"; + hash = "sha256-R0p9ceNjd9xnikxaCjDFwN4HkfRr+4ezVSlXqLP/YuQ="; + meta = { + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + po = { + version = "0-unstable-2024-04-20"; + url = "github:erasin/tree-sitter-po/bd860a0f57f697162bf28e576674be9c1500db5e"; + hash = "sha256-/St0VxDTAF872ZlBph1TukRoO0PBIOMT0D11DZ6nSLQ="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + pod = { + version = "0-unstable-2024-08-23"; + url = "github:tree-sitter-perl/tree-sitter-pod/release"; + hash = "sha256-yV2kVAxWxdyIJ3g2oivDc01SAQF0lc7UMT2sfv9lKzI="; + + meta = { + license = lib.licenses.artistic2; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + ponylang = { + version = "0-unstable-2023-03-13"; + url = "github:mfelsche/tree-sitter-ponylang/cc8a0ff12f4f9e56f8a0d997c55155b702938dfe"; + hash = "sha256-/Qyr6TPmYPVQuWUmkb/77k94DK7nzlAA3hjSjeF6MeI="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + powershell = { + version = "0-unstable-2025-12-08"; + url = "github:airbus-cert/tree-sitter-powershell/7212f47716ced384ac012b2cc428fd9f52f7c5d4"; + hash = "sha256-xzDM1CdBY95XgLsEjqKWrwuIf/s6/2Q0XbxJRvOuL2o="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + prisma = { version = "1.6.0"; url = "github:victorhqc/tree-sitter-prisma"; @@ -757,6 +1882,30 @@ }; }; + prolog = { + version = "0-unstable-2025-03-23"; + url = "codeberg:foxy/tree-sitter-prolog/d8d415f6a1cf80ca138524bcc395810b176d40fa"; + hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + properties = { + version = "0-unstable-2025-07-14"; + url = "github:tree-sitter-grammars/tree-sitter-properties/6310671b24d4e04b803577b1c675d765cbd5773b"; + hash = "sha256-LRutvpXXVK7z+xrnLQVvLY+VRg8IB/VK572PNgvsQfc="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + proto = { version = "0-unstable-2021-06-12"; url = "github:mitchellh/tree-sitter-proto/42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"; @@ -766,6 +1915,18 @@ }; }; + prql = { + version = "0-unstable-2023-07-28"; + url = "github:PRQL/tree-sitter-prql/09e158cd3650581c0af4c49c2e5b10c4834c8646"; + hash = "sha256-bdT7LZ2x7BdUqLJRq4ENJTaIFnciac7l2dCxOSB09CI="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + pug = { version = "0-unstable-2024-11-17"; url = "github:zealot128/tree-sitter-pug/13e9195370172c86a8b88184cc358b23b677cc46"; @@ -775,6 +1936,18 @@ }; }; + purescript = { + version = "0-unstable-2025-06-17"; + url = "github:postsolar/tree-sitter-purescript/f541f95ffd6852fbbe88636317c613285bc105af"; + hash = "sha256-tONS2Eai/eVDecn6ow4nN9F7++UjY6OAKezeCco8hYU="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + python = { version = "0.25.0"; url = "github:tree-sitter/tree-sitter-python"; @@ -784,15 +1957,6 @@ }; }; - ql-dbscheme = { - version = "0.23.1"; - url = "github:tree-sitter/tree-sitter-ql-dbscheme"; - hash = "sha256-lXHm+I3zzCUOR/HjnhQM3Ga+yZr2F2WN28SmpT9Q6nE="; - meta = { - license = lib.licenses.mit; - }; - }; - ql = { version = "0.23.1"; url = "github:tree-sitter/tree-sitter-ql"; @@ -802,6 +1966,12 @@ }; }; + ql-dbscheme = { + version = "0.23.1"; + url = "github:tree-sitter/tree-sitter-ql-dbscheme"; + hash = "sha256-lXHm+I3zzCUOR/HjnhQM3Ga+yZr2F2WN28SmpT9Q6nE="; + }; + qmljs = rec { version = "0.3.0"; url = "github:yuja/tree-sitter-qmljs?ref=${version}"; @@ -823,6 +1993,18 @@ }; }; + quint = { + version = "0-unstable-2025-04-09"; + url = "github:gruhn/tree-sitter-quint/release"; + hash = "sha256-Eo9jvIhiRlMvNYSqQVS9/sIIkmIWpDJfenqObTWgy40="; + meta = { + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + r = { version = "1.2.0"; url = "github:r-lib/tree-sitter-r"; @@ -862,6 +2044,18 @@ }; }; + rescript = { + version = "0-unstable-2025-03-03"; + url = "github:rescript-lang/tree-sitter-rescript/d2df8a285fff95de56a91d2f8152aeceb66f40ef"; + hash = "sha256-yNZrihl4BNvLu0Zqr4lSqvdZCeXU3KnCY7ZYC1U42R0="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + river = { version = "0-unstable-2023-11-22"; url = "github:grafana/tree-sitter-river/eafcdc5147f985fea120feb670f1df7babb2f79e"; @@ -871,6 +2065,30 @@ }; }; + robot = { + version = "0-unstable-2025-05-01"; + url = "github:Hubro/tree-sitter-robot/e34def7cb0d8a66a59ec5057fe17bb4e6b17b56a"; + hash = "sha256-fTV45TQp2Z+ivh2YWphlJjyuBh0iMCpaNDyKoHrNAh0="; + meta = { + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + ron = { + version = "0-unstable-2024-05-05"; + url = "github:tree-sitter-grammars/tree-sitter-ron/78938553b93075e638035f624973083451b29055"; + hash = "sha256-Sp0g6AWKHNjyUmL5k3RIU+5KtfICfg3o/DH77XRRyI0="; + meta = { + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + rst = { version = "0.2.0"; url = "github:stsewd/tree-sitter-rst"; @@ -898,6 +2116,18 @@ }; }; + rust-format-args = { + version = "0-unstable-2025-07-14"; + url = "github:nik-rev/tree-sitter-rust-format-args/3cf8431a4951656bcf24ae06689fbd094fce0187"; + hash = "sha256-lt4vs14DZXCxlpG7awmrZ5Ml5Sr0kKEn5Y26xrlM/ww="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + scala = { version = "0.24.0"; url = "github:tree-sitter/tree-sitter-scala"; @@ -925,6 +2155,18 @@ }; }; + slang = { + version = "0-unstable-2025-09-01"; + url = "github:tree-sitter-grammars/tree-sitter-slang/1dbcc4abc7b3cdd663eb03d93031167d6ed19f56"; + hash = "sha256-UsZpXEJwbKn5M9dqbAv5eJgsCdNbsllbFWtNnDPvtoE="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + slint = { version = "0-unstable-2025-12-09"; url = "github:slint-ui/tree-sitter-slint/10fb0f188d7950400773c06ba6c31075866e14bf"; @@ -934,6 +2176,18 @@ }; }; + smali = { + version = "0-unstable-2024-05-05"; + url = "github:amaanq/tree-sitter-smali/fdfa6a1febc43c7467aa7e937b87b607956f2346"; + hash = "sha256-S0U6Xuntz16DrpYwSqMQu8Cu7UuD/JufHUxIHv826yw="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + smithy = { version = "0.2.0"; url = "github:indoorvivants/tree-sitter-smithy"; @@ -952,6 +2206,18 @@ }; }; + snakemake = { + version = "0-unstable-2025-09-18"; + url = "github:osthomas/tree-sitter-snakemake/68010430c3e51c0e84c1ce21c6551df0e2469f51"; + hash = "sha256-jcMNh+pHjYEvTdShp3o6UlgXRM2AuZMp4KE0uXfNMqY="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + solidity = { version = "1.2.13"; url = "github:JoranHonig/tree-sitter-solidity"; @@ -961,6 +2227,30 @@ }; }; + sourcepawn = { + version = "0-unstable-2025-06-13"; + url = "github:nilshelmig/tree-sitter-sourcepawn/5a8fdd446b516c81e218245c12129c6ad4bccfa2"; + hash = "sha256-TfLCG2Ro3QnGStyCNqHwO54HQMR2fEOV6FjBv+0LjJ0="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + spade = { + version = "0-unstable-2025-12-08"; + url = "gitlab:spade-lang/tree-sitter-spade/6569cd11cc9362e277845ce24111735059b145ee"; + hash = "sha256-h7rlrtV1NHjFPITR1cvYCblkUmbUudem4Ll6Z7qBFqE="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + sparql = { version = "0.1.0-unstable-2025-10-15"; url = "github:GordianDziwis/tree-sitter-sparql/1ef52d35a73a2a5f2e433ecfd1c751c1360a923b"; @@ -970,6 +2260,18 @@ }; }; + spicedb = { + version = "0-unstable-2024-02-08"; + url = "github:jzelinskie/tree-sitter-spicedb/a4e4645651f86d6684c15dfa9931b7841dc52a66"; + hash = "sha256-dEpPkEohBB3qU1Vma/1VePkGGst4nA2RKgun7NiO2OA="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + sql = { version = "0.3.11"; url = "github:derekstride/tree-sitter-sql"; @@ -980,6 +2282,30 @@ }; }; + sshclientconfig = { + version = "0-unstable-2025-12-19"; + url = "github:metio/tree-sitter-ssh-client-config/9c86b2af6d8f9fd0a82edcc253b45c3e8eb93c52"; + hash = "sha256-YF+iMd0F1po0j8FqBO36P6DCpMgscT6YkVMOKetAS6w="; + meta = { + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + strace = { + version = "0-unstable-2025-12-21"; + url = "github:sigmaSd/tree-sitter-strace/ac874ddfcc08d689fee1f4533789e06d88388f29"; + hash = "sha256-BGCbpw85+NNQMF+emS2hllbIeTmiFvveFzlK5lKaD5U="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + supercollider = { version = "0.3.2"; url = "github:madskjeldgaard/tree-sitter-supercollider"; @@ -1007,6 +2333,65 @@ }; }; + sway = { + version = "0-unstable-2025-09-02"; + url = "github:FuelLabs/tree-sitter-sway/9b7845ce06ecb38b040c3940970b4fd0adc331d1"; + hash = "sha256-+BRw4OFQb7FljdKCj5mruK0L9wsZ+1UDTykVLS9wjoY="; + meta = { + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + swift = rec { + version = "0.7.1"; + url = "github:alex-pinkus/tree-sitter-swift/${version}-with-generated-files"; + hash = "sha256-jVZpnwpcQ3sXE4hXQIHKzQgEE13pqE3fGqdRMjb1AOQ="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + t32 = { + version = "0-unstable-2025-12-19"; + url = "github:xasc/tree-sitter-t32/5b5e4336731bda5ea2e6b78b6a2d9e7a89032b75"; + hash = "sha256-dAbjM+wlKtJ3cY3zdRgsdsjJ0ZYDZxTL0mcunqqNbvw="; + meta = { + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + tablegen = { + version = "0-unstable-2024-10-04"; + url = "github:Flakebi/tree-sitter-tablegen/3e9c4822ab5cdcccf4f8aa9dcd42117f736d51d9"; + hash = "sha256-8yn/Czv/aNQfa/k8gnr8qeCsuDtU2L2qHGKAMbv8Vgk="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + tact = { + version = "0-unstable-2025-05-01"; + url = "github:tact-lang/tree-sitter-tact/a6267c2091ed432c248780cec9f8d42c8766d9ad"; + hash = "sha256-2AUN/VYor3K0hkneLYa6+LjE+V8EJogFqBTgdfvOiKM="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + talon = rec { version = "5.0.0"; url = "github:wenkokke/tree-sitter-talon?ref=${version}"; @@ -1016,6 +2401,42 @@ }; }; + task = { + version = "0-unstable-2022-08-17"; + url = "github:alexanderbrevig/tree-sitter-task/ed4fb3674dd2d889c36e121f7173099290452af2"; + hash = "sha256-0vqXoDgQcAE1rm3kFlb+l/S4cZuL5sU3WsZMDSna1+s="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + tcl = { + version = "0-unstable-2025-05-14"; + url = "github:tree-sitter-grammars/tree-sitter-tcl/8f11ac7206a54ed11210491cee1e0657e2962c47"; + hash = "sha256-JrGSHGolf7OhInxotXslw1QXxJscl+bXCxZPYJeBfTY="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + teal = { + version = "0-unstable-2025-05-14"; + url = "github:euclidianAce/tree-sitter-teal/05d276e737055e6f77a21335b7573c9d3c091e2f"; + hash = "sha256-JDqWr895Ob1Jn3Kf44xbkMJqyna0AiMBU5xJpA6ZP7w="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + templ = { version = "1.0.0-unstable-2025-12-03"; url = "github:vrischmann/tree-sitter-templ/3057cd485f7f23a8ad24107c6adc604f8c5ce3db"; @@ -1034,6 +2455,30 @@ }; }; + textproto = { + version = "0-unstable-2024-10-16"; + url = "github:PorterAtGoogle/tree-sitter-textproto/568471b80fd8793d37ed01865d8c2208a9fefd1b"; + hash = "sha256-VAj8qSxbkFqNp0X8BOZNvGTggSXZvzDjODedY11J0BQ="; + meta = { + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + thrift = { + version = "0-unstable-2024-04-20"; + url = "github:tree-sitter-grammars/tree-sitter-thrift/68fd0d80943a828d9e6f49c58a74be1e9ca142cf"; + hash = "sha256-owZbs8ttjKrqTA8fQ/NmBGyIUUItSUvvW4hRv0NPV8Y="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + tiger = { version = "0.3.0-unstable-2025-03-13"; url = "github:ambroisie/tree-sitter-tiger/4a77b2d7a004587646bddc4e854779044b6db459"; @@ -1046,7 +2491,6 @@ tlaplus = rec { # FIXME: remove language override after release is available that includes # https://github.com/tlaplus-community/tree-sitter-tlaplus/pull/138 - language = "@tlaplus/tlaplus"; version = "1.5.0"; url = "github:tlaplus-community/tree-sitter-tlaplus?ref=${version}"; hash = "sha256-k34gkAd0ueXEAww/Hc1mtBfn0Kp1pIBQtjDZ9GQeB4Q="; @@ -1118,6 +2562,18 @@ }; }; + typespec = { + version = "0-unstable-2025-06-21"; + url = "github:happenslol/tree-sitter-typespec/814c98283fd92a248ba9d49ebfe61bc672a35875"; + hash = "sha256-3/zNoawx1DsKmG0KFvJD+o80IMBsJd2VV2ng+fSrV1c="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + typst = { version = "0.11.0"; url = "github:uben0/tree-sitter-typst"; @@ -1136,6 +2592,79 @@ }; }; + ungrammar = { + version = "0-unstable-2023-02-28"; + url = "github:Philipp-M/tree-sitter-ungrammar/debd26fed283d80456ebafa33a06957b0c52e451"; + hash = "sha256-ftvcD8I+hYqH3EGxaRZ0w8FHjBA34OSTTsrUsAOtayU="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + unison = { + version = "0-unstable-2025-03-06"; + url = "github:kylegoetz/tree-sitter-unison/169e7f748a540ec360c0cb086b448faad012caa4"; + hash = "sha256-0HOLtLh1zRdaGQqchT5zFegWKJHkQe9r7DGKL6sSkPo="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + uxntal = { + version = "0-unstable-2024-03-23"; + url = "github:Jummit/tree-sitter-uxntal/1a44f8d31053096b79c52f10a39da12479edbf64"; + hash = "sha256-S6B2K2eqHktLknpfTATR5fZYE8+W1BvOYTSNTwslSVg="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + v = rec { + version = "0.0.6"; + url = "github:vlang/v-analyzer/${version}"; + hash = "sha256-lBrX5n4hYdDq+2m7j9JXyeGGS3yl4oBu8jK7VV+OE7I="; + location = "tree_sitter_v"; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + vala = { + version = "0-unstable-2024-10-29"; + url = "github:vala-lang/tree-sitter-vala/97e6db3c8c73b15a9541a458d8e797a07f588ef4"; + hash = "sha256-hAekweZGDHVrWVd04RrN+9Jz0D2kode+DpceTlUXii0="; + meta = { + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + vento = { + version = "0-unstable-2024-12-30"; + url = "github:ventojs/tree-sitter-vento/3b32474bc29584ea214e4e84b47102408263fe0e"; + hash = "sha256-h8yC+MJIAH7DM69UQ8moJBmcmrSZkxvWrMb+NqtYB2Y="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + verilog = { version = "1.0.3"; url = "github:tree-sitter/tree-sitter-verilog"; @@ -1145,6 +2674,30 @@ }; }; + vhdl = { + version = "0-unstable-2025-12-18"; + url = "github:jpt13653903/tree-sitter-vhdl/7ae08deb5d1641aa57111342218ca1e1b3a5d539"; + hash = "sha256-IJ6Gqq+3YJlL4n4cjtCLUCZKpLVJQa81nQrLsJBCccs="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + vhs = { + version = "0-unstable-2025-03-26"; + url = "github:charmbracelet/tree-sitter-vhs/0c6fae9d2cfc5b217bfd1fe84a7678f5917116db"; + hash = "sha256-o7Q/3wwiCjxO6hBfj1Wxoz2y6+wxLH+oCLiapox7+Hk="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + vim = { version = "0.2.0-unstable-2023-05-05"; url = "github:vigoux/tree-sitter-viml/7c317fbade4b40baa7babcd6c9097c157d148e60"; @@ -1163,6 +2716,62 @@ }; }; + wast = { + version = "0-unstable-2022-05-17"; + url = "github:wasm-lsp/tree-sitter-wasm/2ca28a9f9d709847bf7a3de0942a84e912f59088"; + hash = "sha256-a1l4RsGpRQfUxEjwewyKiV0G7J2DHZW6+y1HnjREYAs="; + location = "wast"; + meta = { + license = with lib.licenses; [ + asl20 + llvm-exception + ]; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + wat = { + version = "0-unstable-2022-05-17"; + url = "github:wasm-lsp/tree-sitter-wasm/2ca28a9f9d709847bf7a3de0942a84e912f59088"; + hash = "sha256-a1l4RsGpRQfUxEjwewyKiV0G7J2DHZW6+y1HnjREYAs="; + location = "wat"; + meta = { + license = with lib.licenses; [ + asl20 + llvm-exception + ]; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + werk = { + version = "0-unstable-2025-03-19"; + url = "github:little-bonsai/tree-sitter-werk/92b0f7fe98465c4c435794a58e961306193d1c1e"; + hash = "sha256-VPY1fMYGSF1+87ia+d7b7l8PzNIoKwAbAT+yw5KHjjQ="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + wesl = { + version = "0-unstable-2025-09-26"; + url = "github:wgsl-tooling-wg/tree-sitter-wesl/3fa2b96bf5c217dae9bf663e2051fcdad0762c19"; + hash = "sha256-O3n65StgGhxfdwYF/QPBTdkXEGjY2ajHeLpF5JWuTc8="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + wgsl = { version = "0-unstable-2023-01-09"; url = "github:szebniok/tree-sitter-wgsl/40259f3c77ea856841a4e0c4c807705f3e4a2b65"; @@ -1181,6 +2790,66 @@ }; }; + wit = { + version = "0-unstable-2022-10-31"; + url = "github:hh9527/tree-sitter-wit/c917790ab9aec50c5fd664cbfad8dd45110cfff3"; + hash = "sha256-5+cw9vWPizK7YlEhiNJheYVYOgtheEifd4g1KF5ldyE="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + wren = { + version = "0-unstable-2024-01-01"; + url = "sourcehut:~jummit/tree-sitter-wren/6748694be32f11e7ec6b5faeb1b48ca6156d4e06"; + hash = "sha256-CU08QY4X/u4W4AEkK+gUmy5P8/XoBHDJmWX1vdGjmsI="; + meta = { + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + xit = { + version = "0-unstable-2024-03-16"; + url = "github:synaptiko/tree-sitter-xit/a4fad351bfa5efdcb379b40c36671413fbe9caac"; + hash = "sha256-wTr7YyGnz/dWfA5oecRqxeR8Unoob6isGnQg4/iu+MI="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + xml = { + version = "0-unstable-2023-01-17"; + url = "github:RenjiSann/tree-sitter-xml/48a7c2b6fb9d515577e115e6788937e837815651"; + hash = "sha256-8c/XtnffylxiqX3Q7VFWlrk/655FG2pwqYrftGpnVxI="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + xtc = { + version = "0-unstable-2024-04-15"; + url = "github:Alexis-Lapierre/tree-sitter-xtc/7bc11b736250c45e25cfb0215db2f8393779957e"; + hash = "sha256-teUDDvH8Km1WHNXyrUtX1yULYOaTgaAwT6aCaR4MTfs="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + yaml = { version = "0.7.2"; url = "github:tree-sitter-grammars/tree-sitter-yaml"; @@ -1199,6 +2868,30 @@ }; }; + yara = { + version = "0-unstable-2024-12-12"; + url = "github:egibs/tree-sitter-yara/eb3ede203275c38000177f72ec0f9965312806ef"; + hash = "sha256-twcbL2fKOE0PdiEboSIObzAedljZ3arBm6QQUw/W5HQ="; + meta = { + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + + yuck = { + version = "0-unstable-2024-05-05"; + url = "github:Philipp-M/tree-sitter-yuck/e877f6ade4b77d5ef8787075141053631ba12318"; + hash = "sha256-l8c1/7q8S78jGyl+VAVVgs8wq58PrrjycyJfWXsCgAI="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aciceri + ]; + }; + }; + zig = { version = "0-unstable-2024-10-13"; url = "github:maxxnino/tree-sitter-zig/a80a6e9be81b33b182ce6305ae4ea28e29211bd5"; diff --git a/pkgs/kde/plasma/spectacle/default.nix b/pkgs/kde/plasma/spectacle/default.nix index 3ecbb17b42f0..7b158359610b 100644 --- a/pkgs/kde/plasma/spectacle/default.nix +++ b/pkgs/kde/plasma/spectacle/default.nix @@ -8,7 +8,7 @@ tesseract5, }: let - tesseract = (tesseract5.override { enableLanguages = tesseractLanguages; }); + tesseract = tesseract5.override { enableLanguages = tesseractLanguages; }; in mkKdeDerivation { pname = "spectacle"; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 507fa59f3aee..e05c7cb756ad 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -195,5 +195,6 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; priority = 15; # below systemd (halt, init, poweroff, reboot) and coreutils + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "busybox" version; }; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index de8714897649..82d7b39f3b4b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -126,7 +126,8 @@ ]; "airpatrol" = ps: with ps; [ - ]; # missing inputs: airpatrol + airpatrol + ]; "airq" = ps: with ps; [ aioairq @@ -6639,7 +6640,8 @@ ]; "viaggiatreno" = ps: with ps; [ - ]; # missing inputs: viaggiatreno_ha + viaggiatreno-ha + ]; "vicare" = ps: with ps; [ pyvicare @@ -6772,7 +6774,8 @@ python-matter-server pyturbojpeg securetar - ]; # missing inputs: visionpluspython + visionpluspython + ]; "watttime" = ps: with ps; [ aiowatttime @@ -7176,6 +7179,7 @@ "airnow" "airobot" "airos" + "airpatrol" "airq" "airthings" "airthings_ble" @@ -8131,6 +8135,7 @@ "water_heater" "waterfurnace" "watergate" + "watts" "watttime" "waze_travel_time" "weather" diff --git a/pkgs/servers/home-assistant/custom-components/battery_notes/package.nix b/pkgs/servers/home-assistant/custom-components/battery_notes/package.nix index 3ef33f9c3d60..96545d70b9fe 100644 --- a/pkgs/servers/home-assistant/custom-components/battery_notes/package.nix +++ b/pkgs/servers/home-assistant/custom-components/battery_notes/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "andrew-codechimp"; domain = "battery_notes"; - version = "3.3.0"; + version = "3.3.2"; src = fetchFromGitHub { inherit owner; repo = "HA-Battery-Notes"; tag = version; - hash = "sha256-WOSWiWojT0pUhKvnl7qGvk6IHjENOy1rr0SFpTaQ0yI="; + hash = "sha256-vsReMeyLuKUzB/XldEOEjW4sfyzYC0lKPgUVnvKMUJM="; }; # has no tests diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 8a60c8fa1acb..4154d066d06a 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.16.0"; + version = "2.16.1"; pyproject = false; pythonPath = [ setuptools ]; @@ -22,7 +22,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = "Tautulli"; tag = "v${version}"; - sha256 = "sha256-nqSqWRst+gx9aZ2Ko+/tKzpQX7wuU4Bn3vLR5F87aJA="; + sha256 = "sha256-Zct7EhnU5LROO23Joz6OxQTtC9uGZhtceSG+aX6MI2c="; }; installPhase = '' diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index a5e8459355ac..569877e9c994 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -106,5 +106,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; mainProgram = "find"; maintainers = [ lib.maintainers.mdaniels5757 ]; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" finalAttrs.version; }; }) diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix index 7e0ddc4f4846..c111fb6e93d8 100644 --- a/pkgs/tools/package-management/lix/common-lix.nix +++ b/pkgs/tools/package-management/lix/common-lix.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "lix"; version = "${version}${suffix}"; - VERSION_SUFFIX = suffix; + env.VERSION_SUFFIX = suffix; inherit src patches; diff --git a/pkgs/tools/package-management/nix/modular/packaging/everything.nix b/pkgs/tools/package-management/nix/modular/packaging/everything.nix index 62873710bcf3..8f40b8e4250f 100644 --- a/pkgs/tools/package-management/nix/modular/packaging/everything.nix +++ b/pkgs/tools/package-management/nix/modular/packaging/everything.nix @@ -252,6 +252,7 @@ stdenv.mkDerivation (finalAttrs: { "nix-util" "nix-util-c" ]; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "nixos" version; }; }) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index d22e3434d738..c353e1cd938d 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -115,6 +115,9 @@ stdenv.mkDerivation { ]; platforms = lib.platforms.all; mainProgram = "grep"; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" version // { + product = "grep"; + }; }; passthru = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1a5af707b92..5d294524ca5e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -584,6 +584,8 @@ self: super: with self; { airos = callPackage ../development/python-modules/airos { }; + airpatrol = callPackage ../development/python-modules/airpatrol { }; + airportsdata = callPackage ../development/python-modules/airportsdata { }; airthings-ble = callPackage ../development/python-modules/airthings-ble { }; @@ -11301,6 +11303,8 @@ self: super: with self; { }; }; + onnx-asr = callPackage ../development/python-modules/onnx-asr { }; + onnx-ir = callPackage ../development/python-modules/onnx-ir { }; onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { }; @@ -19367,7 +19371,9 @@ self: super: with self; { name: value: !(builtins.elem name [ "tree-sitter-go-template" + "tree-sitter-php-only" "tree-sitter-sql" + "tree-sitter-sshclientconfig" "tree-sitter-templ" ]) ) pkgs.tree-sitter.builtGrammars @@ -20456,6 +20462,8 @@ self: super: with self; { vharfbuzz = callPackage ../development/python-modules/vharfbuzz { }; + viaggiatreno-ha = callPackage ../development/python-modules/viaggiatreno-ha { }; + victron-vrm = callPackage ../development/python-modules/victron-vrm { }; videocr = callPackage ../development/python-modules/videocr { }; @@ -20486,6 +20494,8 @@ self: super: with self; { viser = callPackage ../development/python-modules/viser { }; + visionpluspython = callPackage ../development/python-modules/visionpluspython { }; + visions = callPackage ../development/python-modules/visions { }; visitor = callPackage ../development/python-modules/visitor { };