diff --git a/pkgs/development/tools/djhtml/default.nix b/pkgs/by-name/dj/djhtml/package.nix similarity index 70% rename from pkgs/development/tools/djhtml/default.nix rename to pkgs/by-name/dj/djhtml/package.nix index dc94350fdb2b..2f4f4be65d3d 100644 --- a/pkgs/development/tools/djhtml/default.nix +++ b/pkgs/by-name/dj/djhtml/package.nix @@ -1,10 +1,9 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - setuptools, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "djhtml"; version = "3.0.8"; pyproject = true; @@ -16,16 +15,16 @@ buildPythonApplication rec { hash = "sha256-1bopV6mjwjXdoIN9i3An4NvSpeGcVlQ24nLLjP/UfQU="; }; - build-system = [ setuptools ]; + build-system = [ python3Packages.setuptools ]; pythonImportsCheck = [ "djhtml" ]; - meta = with lib; { + meta = { homepage = "https://github.com/rtts/djhtml"; description = "Django/Jinja template indenter"; changelog = "https://github.com/rtts/djhtml/releases/tag/${src.tag}"; - license = licenses.gpl3Plus; - maintainers = [ ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ]; mainProgram = "djhtml"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d9af12de2a7..72f0db0da184 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -395,8 +395,6 @@ with pkgs; } ); - djhtml = python3Packages.callPackage ../development/tools/djhtml { }; - dnf-plugins-core = with python3Packages; toPythonApplication dnf-plugins-core; dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { };