Merge pull request #232766 from fabaff/kajiki-fix

python311Packages.kajiki: add input linetable

pkgs/development/python-modules/kajiki/default.nix

@@ -1,15 +1,18 @@
 { lib
+, babel
 , buildPythonPackage
 , fetchFromGitHub
-, babel
-, pytz
-, nine
+, linetable
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "kajiki";
   version = "0.9.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "jackrosenthal";
@@ -18,15 +21,24 @@ buildPythonPackage rec {
     hash = "sha256-EbXe4Jh2IKAYw9GE0kFgKVv9c9uAOiFFYaMF8CGaOfg=";
   };
 
-  propagatedBuildInputs = [ babel pytz nine ];
+  propagatedBuildInputs = [
+    linetable
+  ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    babel
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "kajiki"
+  ];
 
   meta = with lib; {
-    description = "Kajiki provides fast well-formed XML templates";
+    description = "Module provides fast well-formed XML templates";
     homepage = "https://github.com/nandoflorestan/kajiki";
+    changelog = "https://github.com/jackrosenthal/kajiki/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ onny ];
   };
-
 }

pkgs/development/python-modules/linetable/default.nix

@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "linetable";
+  version = "0.0.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "amol-";
+    repo = "linetable";
+    rev = "refs/tags/${version}";
+    hash = "sha256-nVZVxK6uB5TP0pReaEya3/lFXFkiqpnnaWqYzxzO6bM=";
+  };
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "linetable"
+  ];
+
+  meta = with lib; {
+    description = "Library to parse and generate co_linetable attributes in Python code objects";
+    homepage = "https://github.com/amol-/linetable";
+    changelog = "https://github.com/amol-/linetable/releases/tag/${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}

pkgs/top-level/python-packages.nix

@@ -5757,6 +5757,8 @@ self: super: with self; {
 
   line_profiler = callPackage ../development/python-modules/line_profiler { };
 
+  linetable = callPackage ../development/python-modules/linetable { };
+
   lingua = callPackage ../development/python-modules/lingua { };
 
   linkify-it-py = callPackage ../development/python-modules/linkify-it-py { };