diff options
author | Tom Prince <tom.prince@private.storage> | 2021-12-02 14:44:01 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-12-09 19:29:18 -0800 |
commit | 427912ea93fc9f4025b2565171389b89588a0c1e (patch) | |
tree | 92ad56bbda1da73f8e0cbdcb24180d50f4133346 /pkgs/top-level | |
parent | deaec9f2890f900c74b6fe3fa698092c16fde320 (diff) |
Move where a couple of existing packages are disabled on python2.
This moves where the package are disabled to `pkgs/top-level/python2-packages.nix`.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/python2-packages.nix | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79b2044f69b55..bac0ccbcbd966 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5447,10 +5447,10 @@ in { opentracing = callPackage ../development/python-modules/opentracing { }; - openvino = disabledIf isPy27 (toPythonModule (pkgs.openvino.override { + openvino = toPythonModule (pkgs.openvino.override { inherit (self) python; enablePython = true; - })); + }); openwebifpy = callPackage ../development/python-modules/openwebifpy { }; @@ -8206,9 +8206,9 @@ in { recaptcha_client = callPackage ../development/python-modules/recaptcha_client { }; - recoll = disabledIf (!isPy3k) (toPythonModule (pkgs.recoll.override { + recoll = toPythonModule (pkgs.recoll.override { python3Packages = self; - })); + }); recommonmark = callPackage ../development/python-modules/recommonmark { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index a8899a18198c2..df66908d51356 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -373,6 +373,8 @@ with self; with super; { openpyxl = callPackage ../development/python-modules/openpyxl/2.nix { }; + openvino = disabled super.openvino; + openwrt-luci-rpc = disabled super.openwrt-luci-rpc; opt-einsum = callPackage ../development/python-modules/opt-einsum/2.nix { }; @@ -520,6 +522,8 @@ with self; with super; { remotecv = callPackage ../development/python-modules/remotecv { }; + recoll = disabled super.recoll; + rhpl = callPackage ../development/python-modules/rhpl { }; rivet = disabled super.rivet; |