diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 74e06d4311ce..ff458cedba10 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a0be5f8ff3f..173e30b00c11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28443,9 +28443,7 @@ with pkgs; imlib2 = imlib2-nox; }; - watson = callPackage ../applications/office/watson { - pythonPackages = python3Packages; - }; + watson = callPackage ../applications/office/watson { }; wapiti = callPackage ../tools/security/wapiti { };