From deaec9f2890f900c74b6fe3fa698092c16fde320 Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Thu, 2 Dec 2021 12:57:55 -0700 Subject: [PATCH] Fix some places where python2 packages fail to evaluate. I unfortunately still depend on some python2 packages. It appears that these two packages fail to evaluate, in a way that `tryEval` doesn't catch. This changes them to be explicitly disabled there. --- pkgs/top-level/python-packages.nix | 2 ++ pkgs/top-level/python2-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29655c95ce4c..79b2044f69b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -545,6 +545,8 @@ in { appdirs = callPackage ../development/python-modules/appdirs { }; + appleseed = toPythonModule (pkgs.appleseed.override { python3 = self.python; }); + applicationinsights = callPackage ../development/python-modules/applicationinsights { }; appnope = callPackage ../development/python-modules/appnope { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 7e485bdf3bfb..a8899a18198c 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -12,7 +12,7 @@ with self; with super; { inherit (pkgs) antlr4; }; - appleseed = toPythonModule (pkgs.appleseed.override { inherit (self) python; }); + appleseed = disabled super.appleseed; application = callPackage ../development/python-modules/application { }; @@ -616,6 +616,8 @@ with self; with super; { tarman = callPackage ../development/python-modules/tarman { }; + tensorflow-bin = disabled super.tensorflow-bin; + thumbor = callPackage ../development/python-modules/thumbor { }; tmdb3 = callPackage ../development/python-modules/tmdb3 { };