Merge pull request #246664 from dotlambda/lektor-top-level (2b0e5771) · Commits · nix / nixpkgs

pkgs/development/python-modules/lektor/default.nix→pkgs/tools/misc/lektor/default.nix

+9 −39

Original line number	Diff line number	Diff line
		{ lib
		, babel
		, buildPythonPackage
		, click
		, exifread
		, fetchFromGitHub
		, fetchNpmDeps
		, filetype
		, flask
		, hatch-vcs
		, hatchling
		, importlib-metadata
		, inifile
		, jinja2
		, markupsafe
		, marshmallow
		, marshmallow-dataclass
		, mistune
		, nodejs
		, npmHooks
		, pillow
		, pip
		, pytest-click
		, pytest-mock
		, pytest-pylint
		, pytestCheckHook
		, python
		, pythonOlder
		, python-slugify
		, pytz
		, requests
		, watchfiles
		, werkzeug
		, python3
		}:

		buildPythonPackage rec {
		let
		python = python3;
		in python.pkgs.buildPythonApplication rec {
		pname = "lektor";
		version = "3.4.0b8";
		format = "pyproject";

		disabled = pythonOlder "3.7";

		src = fetchFromGitHub {
		owner = "lektor";
		repo = pname;
		@@ -55,15 +28,15 @@ buildPythonPackage rec {
		npmRoot = "frontend";

		nativeBuildInputs = [
		hatch-vcs
		hatchling
		python.pkgs.hatch-vcs
		python.pkgs.hatchling
		nodejs
		npmHooks.npmConfigHook
		];

		env.SETUPTOOLS_SCM_PRETEND_VERSION = version;

		propagatedBuildInputs = [
		propagatedBuildInputs = with python.pkgs; [
		babel
		click
		exifread
		@@ -81,13 +54,9 @@ buildPythonPackage rec {
		requests
		watchfiles
		werkzeug
		] ++ lib.optionals (pythonOlder "3.8") [
		importlib-metadata
		] ++ lib.optionals (pythonOlder "3.9") [
		pytz
		];

		nativeCheckInputs = [
		nativeCheckInputs = with python.pkgs; [
		pytest-click
		pytest-mock
		pytestCheckHook
		@@ -114,6 +83,7 @@ buildPythonPackage rec {
		homepage = "https://www.getlektor.com/";
		changelog = "https://github.com/lektor/lektor/blob/v${version}/CHANGES.md";
		license = licenses.bsd0;
		mainProgram = "lektor";
		maintainers = with maintainers; [ ];
		};
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -1806,6 +1806,8 @@ with pkgs;

		kubevirt = callPackage ../tools/virtualization/kubevirt { };

		lektor = callPackage ../tools/misc/lektor { };

		licenseclassifier = callPackage ../development/tools/misc/licenseclassifier { };

		license-cli = callPackage ../tools/misc/license-cli { };

+1 −0

Original line number	Diff line number	Diff line
		@@ -186,6 +186,7 @@ mapAliases ({
		Keras = keras; # added 2021-11-25
		ldap = python-ldap; # added 2022-09-16
		lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
		lektor = throw "lektor has been promoted to a top-level attribute"; # added 2023-08-01
		logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29
		logilab_common = logilab-common; # added 2022-11-21
		loo-py = loopy; # added 2022-05-03

+0 −2

Original line number	Diff line number	Diff line
		@@ -5807,8 +5807,6 @@ self: super: with self; {
		igraph-c = pkgs.igraph;
		};

		lektor = callPackage ../development/python-modules/lektor { };

		leveldb = callPackage ../development/python-modules/leveldb { };

		levenshtein = callPackage ../development/python-modules/levenshtein { };