Merge pull request #137552 from dotlambda/watson-packageOverrides
watson: use packageOverrides
This commit is contained in:
commit
283a9f5ff9
2 changed files with 8 additions and 11 deletions
|
@ -1,6 +1,4 @@
|
|||
{ lib, fetchFromGitHub, pythonPackages, installShellFiles }:
|
||||
|
||||
with pythonPackages;
|
||||
{ lib, fetchFromGitHub, python3, installShellFiles }:
|
||||
|
||||
let
|
||||
# Watson is currently not compatible with Click 8. See the following
|
||||
|
@ -10,11 +8,12 @@ let
|
|||
# https://github.com/TailorDev/Watson/pull/432
|
||||
#
|
||||
# Workaround the issue by providing click 7 explicitly.
|
||||
click7 = pythonPackages.callPackage ../../../development/python-modules/click/7.nix {};
|
||||
click7-didyoumean = click-didyoumean.override {
|
||||
click = click7;
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
click = self.callPackage ../../../development/python-modules/click/7.nix { };
|
||||
};
|
||||
};
|
||||
in buildPythonApplication rec {
|
||||
in with python.pkgs; buildPythonApplication rec {
|
||||
pname = "watson";
|
||||
|
||||
# When you update Watson, please check whether the Click 7
|
||||
|
@ -34,7 +33,7 @@ in buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ];
|
||||
propagatedBuildInputs = [ arrow click7 click7-didyoumean requests ];
|
||||
propagatedBuildInputs = [ arrow click click-didyoumean requests ];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -28454,9 +28454,7 @@ with pkgs;
|
|||
imlib2 = imlib2-nox;
|
||||
};
|
||||
|
||||
watson = callPackage ../applications/office/watson {
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
watson = callPackage ../applications/office/watson { };
|
||||
|
||||
wapiti = callPackage ../tools/security/wapiti { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue