diff options
author | Fabian Affolter <fabian@affolter-engineering.ch> | 2023-04-10 00:43:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-10 00:43:12 +0200 |
commit | d02bb4cf07bc15976c6e67e9acf5da40ffb3af34 (patch) | |
tree | 3c7e0d1e008c595bb5877406e6e948ec97faab8a | |
parent | 261b9ad7c0b0b5335b46ec2aae4a3eda6731153a (diff) | |
parent | 97e9e9afceaa12120d7540230a59b398dc8f9ec9 (diff) | |
download | nixpkgs-d02bb4cf07bc15976c6e67e9acf5da40ffb3af34.tar nixpkgs-d02bb4cf07bc15976c6e67e9acf5da40ffb3af34.tar.gz nixpkgs-d02bb4cf07bc15976c6e67e9acf5da40ffb3af34.tar.bz2 nixpkgs-d02bb4cf07bc15976c6e67e9acf5da40ffb3af34.tar.lz nixpkgs-d02bb4cf07bc15976c6e67e9acf5da40ffb3af34.tar.xz nixpkgs-d02bb4cf07bc15976c6e67e9acf5da40ffb3af34.tar.zst nixpkgs-d02bb4cf07bc15976c6e67e9acf5da40ffb3af34.zip |
Merge pull request #223432 from fabaff/zeekscript
zeekscript: init at 1.2.1
-rw-r--r-- | pkgs/development/python-modules/tree-sitter/default.nix | 41 | ||||
-rw-r--r-- | pkgs/tools/security/zeekscript/default.nix | 35 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
4 files changed, 80 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix new file mode 100644 index 00000000000..541051c8690 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "tree-sitter"; + version = "0.20.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "tree_sitter"; + inherit version; + hash = "sha256-6T8ILFRdZkm8+11oHtJV6wBKbOIpiJcaEo9AaS/uxg0="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + # PyPI tarball doesn't contains tests and source has additional requirements + doCheck = false; + + pythonImportsCheck = [ + "tree_sitter" + ]; + + meta = with lib; { + description = "Python bindings to the Tree-sitter parsing library"; + homepage = "https://github.com/tree-sitter/py-tree-sitter"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/zeekscript/default.nix b/pkgs/tools/security/zeekscript/default.nix new file mode 100644 index 00000000000..cf5e44ea8f6 --- /dev/null +++ b/pkgs/tools/security/zeekscript/default.nix @@ -0,0 +1,35 @@ +{ lib +, python3 +, fetchPypi +}: + +python3.pkgs.buildPythonApplication rec { + pname = "zeekscript"; + version = "1.2.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LogI9sJHvLN5WHJGdW47D09XZInKln/I2hNmG62d1JU="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + tree-sitter + ]; + + pythonImportsCheck = [ + "zeekscript" + ]; + + meta = with lib; { + description = "A Zeek script formatter and analyzer"; + homepage = "https://github.com/zeek/zeekscript"; + changelog = "https://github.com/zeek/zeekscript/blob/v${version}/CHANGES"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab tobim ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5ca6bc33c2..20b0c0fe12b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7123,6 +7123,8 @@ with pkgs; zeek = callPackage ../applications/networking/ids/zeek { }; + zeekscript = callPackage ../tools/security/zeekscript { }; + zoekt = callPackage ../tools/text/zoekt { }; zonemaster-cli = perlPackages.ZonemasterCLI; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e856ddb72bc..a48d825f8fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11965,6 +11965,8 @@ self: super: with self; { trectools = callPackage ../development/python-modules/trectools { }; + tree-sitter = callPackage ../development/python-modules/tree-sitter { }; + treelog = callPackage ../development/python-modules/treelog { }; treeo = callPackage ../development/python-modules/treeo { }; |