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

Move where a couple of existing packages are disabled on python2.

Browse Source 
This moves where the package are disabled to `pkgs/top-level/python2-packages.nix`.
This commit is contained in:
Tom Prince 2021-12-02 14:44:01 -07:00 committed by Jonathan Ringer
parent deaec9f289
commit 427912ea93
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/python-packages.nix
View File

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

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

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