JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #137552 from dotlambda/watson-packageOverrides

Browse Source 
watson: use packageOverrides
This commit is contained in:
Sandro 2021-09-12 23:10:24 +02:00 committed by GitHub
commit 283a9f5ff9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/office/watson/default.nix
View File

@ -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; {

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };