From 48932d34080693ae5ec7de428cd696d58a8b1127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 7 Nov 2022 23:45:26 +0100
Subject: [PATCH] python310Packages.jinja2-time: normalise attr and path,
 enable tests, cleanups

---
 .../python-modules/cookiecutter/default.nix   |  4 ++--
 .../{jinja2_time => jinja2-time}/default.nix  | 19 +++++++++++++++++--
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 +-
 4 files changed, 21 insertions(+), 5 deletions(-)
 rename pkgs/development/python-modules/{jinja2_time => jinja2-time}/default.nix (51%)

diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix
index fdad4febcdaf..ce6912f34a98 100644
--- a/pkgs/development/python-modules/cookiecutter/default.nix
+++ b/pkgs/development/python-modules/cookiecutter/default.nix
@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchPypi, isPyPy
 , pytest, pytest-cov, pytest-mock, freezegun
-, jinja2, future, binaryornot, click, jinja2_time, requests
+, jinja2, future, binaryornot, click, jinja2-time, requests
 , python-slugify
 , pyyaml
 }:
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     jinja2
     click
     pyyaml
-    jinja2_time
+    jinja2-time
     python-slugify
     requests
   ];
diff --git a/pkgs/development/python-modules/jinja2_time/default.nix b/pkgs/development/python-modules/jinja2-time/default.nix
similarity index 51%
rename from pkgs/development/python-modules/jinja2_time/default.nix
rename to pkgs/development/python-modules/jinja2-time/default.nix
index 4268413fd3f5..ac0d76c54c55 100644
--- a/pkgs/development/python-modules/jinja2_time/default.nix
+++ b/pkgs/development/python-modules/jinja2-time/default.nix
@@ -1,25 +1,40 @@
 { lib
 , buildPythonPackage
+, fetchpatch
 , fetchPypi
 , arrow
+, freezegun
 , jinja2
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
-  version = "0.2.0";
   pname = "jinja2-time";
+  version = "0.2.0";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "0h0dr7cfpjnjj8bgl2vk9063a53649pn37wnlkd8hxjy656slkni";
   };
 
+  patches = [
+    # fix usage of arrow in tests
+    (fetchpatch {
+      url = "https://github.com/hackebrot/jinja2-time/pull/19/commits/3b2476c266ba53262352153104ca3501722823a4.patch";
+      sha256 = "sha256-zh4PpAj2GtpgaEap/Yvu6DNY84AwH/YTJlUPRRHPyTs=";
+    })
+  ];
+
   propagatedBuildInputs = [ arrow jinja2 ];
 
+  checkInputs = [ freezegun pytestCheckHook ];
+
+  pythonImportsCheck = [ "jinja2_time" ];
+
   meta = with lib; {
     homepage = "https://github.com/hackebrot/jinja2-time";
     description = "Jinja2 Extension for Dates and Times";
     license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
-
 }
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 8a33d02ba1a3..864d0d45b2fa 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -100,6 +100,7 @@ mapAliases ({
   ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30
   influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10
   itanium_demangler = itanium-demangler; # added 2022-1017
+  jinja2_time = jinja2-time; # added 2022-11-07
   jupyter_client = jupyter-client; # added 2021-10-15
   Keras = keras; # added 2021-11-25
   ldap = python-ldap; # added 2022-09-16
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3810767e7d2a..b87d4a5df98d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4722,7 +4722,7 @@ self: super: with self; {
 
   jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { };
 
-  jinja2_time = callPackage ../development/python-modules/jinja2_time { };
+  jinja2-time = callPackage ../development/python-modules/jinja2-time { };
 
   jira = callPackage ../development/python-modules/jira { };