From 2a0b0e3d781b46872c26ab7df5027225aec6b94d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 9 Aug 2023 10:36:35 +0800 Subject: [PATCH] pyditz: use python3Packages --- pkgs/applications/misc/pyditz/cerberus.nix | 19 ------------------- pkgs/applications/misc/pyditz/default.nix | 10 ++++------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 pkgs/applications/misc/pyditz/cerberus.nix diff --git a/pkgs/applications/misc/pyditz/cerberus.nix b/pkgs/applications/misc/pyditz/cerberus.nix deleted file mode 100644 index 4da032bafeee..000000000000 --- a/pkgs/applications/misc/pyditz/cerberus.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pytest-runner, pytest }: - -buildPythonPackage rec { - pname = "Cerberus"; - version = "1.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "1pxzr8sfm2hc5s96m9k044i44nwkva70n0ypr6a35v73zn891cx5"; - }; - - nativeCheckInputs = [ pytest-runner pytest ]; - - meta = with lib; { - homepage = "http://python-cerberus.org/"; - description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; - license = licenses.mit; - }; -} diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix index 87d8deb03e61..9fda9dee0949 100644 --- a/pkgs/applications/misc/pyditz/default.nix +++ b/pkgs/applications/misc/pyditz/default.nix @@ -2,23 +2,21 @@ with pythonPackages; -let - cerberus_1_1 = callPackage ./cerberus.nix { }; -in buildPythonApplication rec { +buildPythonApplication rec { pname = "pyditz"; version = "0.11"; src = fetchPypi { inherit pname version; - sha256 = "da0365ae9064e30c4a27526fb0d7a802fda5c8651cda6990d17be7ede89a2551"; + hash = "sha256-2gNlrpBk4wxKJ1JvsNeoAv2lyGUc2mmQ0Xvn7eiaJVE="; }; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ]; + propagatedBuildInputs = [ pyyaml six jinja2 cerberus ]; nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { - homepage = "https://pythonhosted.org/pyditz/"; + homepage = "https://pypi.org/project/pyditz/"; description = "Drop-in replacement for the Ditz distributed issue tracker"; maintainers = [ maintainers.ilikeavocadoes ]; license = licenses.lgpl2; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44cb19e7e491..80a16863595d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12073,7 +12073,7 @@ with pkgs; teapot = callPackage ../applications/office/teapot { }; pyditz = callPackage ../applications/misc/pyditz { - pythonPackages = python27Packages; + pythonPackages = python3Packages; }; py-spy = darwin.apple_sdk_11_0.callPackage ../development/tools/py-spy { };