Merge pull request #133635 from fgaz/staticjinja/4.1.0

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml

@@ -273,7 +273,7 @@ Superuser created successfully.
       <listitem>
         <para>
           The <literal>staticjinja</literal> package has been upgraded
-          from 1.0.4 to 3.0.1
+          from 1.0.4 to 4.1.0
         </para>
       </listitem>
       <listitem>

nixos/doc/manual/release-notes/rl-2111.section.md

@@ -105,7 +105,7 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable
       Superuser created successfully.
       ```
 
-- The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1
+- The `staticjinja` package has been upgraded from 1.0.4 to 4.1.0
 
 - The `erigon` ethereum node has moved to a new database format in `2021-05-04`, and requires a full resync
 

pkgs/development/python-modules/docopt-ng/default.nix

@@ -0,0 +1,24 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "docopt-ng";
+  version = "0.7.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-hs7qAy8M+lnmB3brDPOKxzZTWBAihyMg9H3IdGeNckQ=";
+  };
+
+  pythonImportsCheck = [ "docopt" ];
+  doCheck = false; # no tests in the package
+
+  meta = with lib; {
+    description = "More-magic command line arguments parser. Now with more maintenance!";
+    homepage = "https://github.com/bazaar-projects/docopt-ng";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fgaz ];
+  };
+}

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

@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , buildPythonPackage
 , poetry
-, docopt
+, docopt-ng
 , easywatch
 , jinja2
 , pytestCheckHook
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "staticjinja";
-  version = "3.0.1";
+  version = "4.1.0";
   format = "pyproject";
 
   # No tests in pypi
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "staticjinja";
     repo = pname;
     rev = version;
-    sha256 = "sha256-W4q0vG8Kl2gCmA8UnUbdiGRtghhdnWxIJXFIIa6BogA=";
+    sha256 = "sha256-4IL+7ncJPd1e7k5oFRjQ6yvDjozcBAAZPf88biNTiLU=";
   };
 
   nativeBuildInputs = [
@@ -31,7 +31,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     jinja2
-    docopt
+    docopt-ng
     easywatch
   ];
 

pkgs/top-level/python-packages.nix

@@ -2165,6 +2165,8 @@ in {
 
   docopt = callPackage ../development/python-modules/docopt { };
 
+  docopt-ng = callPackage ../development/python-modules/docopt-ng { };
+
   docplex = callPackage ../development/python-modules/docplex { };
 
   docrep = callPackage ../development/python-modules/docrep { };