From bcf7e9346dd060cb1ef800435b22c4865039ff0c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 5 Apr 2022 20:11:07 +0000
Subject: [PATCH 1/2] python310Packages.lektor: 3.3.2 -> 3.3.3

---
 pkgs/development/python-modules/lektor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix
index 918cbd2591c2..a0584dd06cbe 100644
--- a/pkgs/development/python-modules/lektor/default.nix
+++ b/pkgs/development/python-modules/lektor/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "lektor";
-  version = "3.3.2";
+  version = "3.3.3";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "lektor";
     repo = "lektor";
-    rev = "v${version}";
-    sha256 = "sha256-PNHQ87aO+b1xseupIOsO7MXdr16s0gjoHGnZhPlKKRY=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-3jPN4VQdIUVjSSGJxPek2RrnXzCwkDxoEBqk4vuL+nc=";
   };
 
   propagatedBuildInputs = [

From bf2d815f5f96075ee468f83b35a316ae8bb895d9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 5 Apr 2022 22:56:00 +0200
Subject: [PATCH 2/2] python3Packages.lektor: disable on older Python releases

- Enable tests
- Add pythonImportsCheck
- Adjust inputs
---
 .../python-modules/lektor/default.nix         | 84 ++++++++++++-------
 1 file changed, 55 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix
index a0584dd06cbe..020506d51910 100644
--- a/pkgs/development/python-modules/lektor/default.nix
+++ b/pkgs/development/python-modules/lektor/default.nix
@@ -1,27 +1,28 @@
 { lib
-, buildPythonPackage
-, fetchFromGitHub
-, click
-, filetype
-, watchdog
-, exifread
-, requests
-, mistune
-, inifile
 , Babel
-, jinja2
+, buildPythonPackage
+, click
+, exifread
+, fetchFromGitHub
+, filetype
 , flask
+, inifile
+, jinja2
+, marshmallow
+, marshmallow-dataclass
+, mistune
+, pip
 , pyopenssl
-, ndg-httpsclient
-, pytestCheckHook
-, pytest-cov
+, pytest-click
 , pytest-mock
 , pytest-pylint
-, pytest-click
+, pytestCheckHook
+, pythonOlder
 , python-slugify
-, isPy27
-, functools32
+, requests
 , setuptools
+, watchdog
+, werkzeug
 }:
 
 buildPythonPackage rec {
@@ -29,30 +30,55 @@ buildPythonPackage rec {
   version = "3.3.3";
   format = "pyproject";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchFromGitHub {
     owner = "lektor";
-    repo = "lektor";
+    repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-3jPN4VQdIUVjSSGJxPek2RrnXzCwkDxoEBqk4vuL+nc=";
+    hash = "sha256-3jPN4VQdIUVjSSGJxPek2RrnXzCwkDxoEBqk4vuL+nc=";
   };
 
   propagatedBuildInputs = [
-    click filetype watchdog exifread requests mistune inifile Babel jinja2
-    flask pyopenssl python-slugify ndg-httpsclient setuptools
-  ] ++ lib.optionals isPy27 [ functools32 ];
-
-  checkInputs = [
-    pytestCheckHook pytest-cov pytest-mock pytest-pylint pytest-click
+    Babel
+    click
+    exifread
+    filetype
+    flask
+    inifile
+    jinja2
+    marshmallow
+    marshmallow-dataclass
+    mistune
+    pip
+    pyopenssl
+    python-slugify
+    requests
+    setuptools
+    watchdog
+    werkzeug
   ];
 
-  # many errors -- tests assume inside of git repo, linting errors 13/317 fail
-  doCheck = false;
+  checkInputs = [
+    pytest-click
+    pytest-mock
+    pytest-pylint
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "lektor"
+  ];
+
+  disabledTests = [
+    # Test requires network access
+    "test_path_installed_plugin_is_none"
+  ];
 
   meta = with lib; {
     description = "A static content management system";
-    homepage    = "https://www.getlektor.com/";
-    license     = licenses.bsd0;
+    homepage = "https://www.getlektor.com/";
+    license = licenses.bsd0;
     maintainers = with maintainers; [ costrouc ];
   };
-
 }