From 34715da5dc3fcbfe031bc7b5a8480b55ee60c588 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 19 Nov 2019 11:40:59 +0100 Subject: [PATCH] pyditz: make python.pkgs.cerberus11 private to it. --- .../misc/pyditz/cerberus.nix} | 0 pkgs/applications/misc/pyditz/default.nix | 14 +++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) rename pkgs/{development/python-modules/cerberus11/default.nix => applications/misc/pyditz/cerberus.nix} (100%) diff --git a/pkgs/development/python-modules/cerberus11/default.nix b/pkgs/applications/misc/pyditz/cerberus.nix similarity index 100% rename from pkgs/development/python-modules/cerberus11/default.nix rename to pkgs/applications/misc/pyditz/cerberus.nix diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix index 0f4e743aba4e..60de2f9abdc9 100644 --- a/pkgs/applications/misc/pyditz/default.nix +++ b/pkgs/applications/misc/pyditz/default.nix @@ -1,18 +1,22 @@ { stdenv, pythonPackages }: -pythonPackages.buildPythonApplication rec { +with pythonPackages; + +let + cerberus_1_1 = callPackage ./cerberus.nix { }; +in buildPythonApplication rec { pname = "pyditz"; version = "0.10.3"; - src = pythonPackages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0hxxz7kxv9gsrr86ccsc31g7bc2agw1ihbxhd659c2m6nrqq5qaf"; }; - nativeBuildInputs = [ pythonPackages.setuptools_scm ]; - propagatedBuildInputs = with pythonPackages; [ pyyaml six jinja2 cerberus11 ]; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ]; checkPhase = '' - ${pythonPackages.python.interpreter} -m unittest discover + ${python.interpreter} -m unittest discover ''; meta = with stdenv.lib; {