From 8850d389fad813e74478c5b1e74b5845200a30b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 28 Jul 2023 09:02:32 -0700
Subject: [PATCH] python310Packages.lektor: 3.4.0b4 -> 3.4.0b8

Diff: https://github.com/lektor/lektor/compare/refs/tags/v3.4.0b4...v3.4.0b8

Changelog: https://github.com/lektor/lektor/blob/v3.4.0b8/CHANGES.md
---
 .../python-modules/lektor/default.nix         | 47 +++++++++++++------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix
index 1549ea201f1..b483a05caab 100644
--- a/pkgs/development/python-modules/lektor/default.nix
+++ b/pkgs/development/python-modules/lektor/default.nix
@@ -2,11 +2,13 @@
 , babel
 , buildPythonPackage
 , click
-, deprecated
 , exifread
 , fetchFromGitHub
+, fetchNpmDeps
 , filetype
 , flask
+, hatch-vcs
+, hatchling
 , importlib-metadata
 , inifile
 , jinja2
@@ -14,8 +16,10 @@
 , marshmallow
 , marshmallow-dataclass
 , mistune
+, nodejs
+, npmHooks
+, pillow
 , pip
-, pyopenssl
 , pytest-click
 , pytest-mock
 , pytest-pylint
@@ -25,15 +29,13 @@
 , python-slugify
 , pytz
 , requests
-, setuptools
-, typing-inspect
-, watchdog
+, watchfiles
 , werkzeug
 }:
 
 buildPythonPackage rec {
   pname = "lektor";
-  version = "3.4.0b4";
+  version = "3.4.0b8";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -42,13 +44,28 @@ buildPythonPackage rec {
     owner = "lektor";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-O0bTmJqRymrQuHW19Y7/Kp+2XlbmDzcjl/jDACDlCSk=";
+    hash = "sha256-FtmRW4AS11zAX2jvGY8XTsPrN3mhHkIWoFY7sXmqG/U=";
   };
 
+  npmDeps = fetchNpmDeps {
+    src = "${src}/frontend";
+    hash = "sha256-Z7LP9rrVSzKoLITUarsnRbrhIw7W7TZSZUgV/OT+m0M=";
+  };
+
+  npmRoot = "frontend";
+
+  nativeBuildInputs = [
+    hatch-vcs
+    hatchling
+    nodejs
+    npmHooks.npmConfigHook
+  ];
+
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   propagatedBuildInputs = [
     babel
     click
-    deprecated
     exifread
     filetype
     flask
@@ -58,17 +75,16 @@ buildPythonPackage rec {
     marshmallow
     marshmallow-dataclass
     mistune
+    pillow
     pip
-    pyopenssl
     python-slugify
-    pytz
     requests
-    setuptools
-    typing-inspect
-    watchdog
+    watchfiles
     werkzeug
   ] ++ lib.optionals (pythonOlder "3.8") [
     importlib-metadata
+  ] ++ lib.optionals (pythonOlder "3.9") [
+    pytz
   ];
 
   nativeCheckInputs = [
@@ -86,8 +102,11 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
-    # Test requires network access
+    # Tests require network access
     "test_path_installed_plugin_is_none"
+    "test_VirtualEnv_run_pip_install"
+    # expects FHS paths
+    "test_VirtualEnv_executable"
   ];
 
   meta = with lib; {