1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-23 17:56:53 +03:00

Revert "python3Packages.bokeh: 2.4.3 -> 3.0.3"

This reverts commit 1ac65c004e.

Reverse dependencies are not ready yet, breaks panel and multiple other
packages.
This commit is contained in:
Martin Weinelt 2023-02-09 13:50:38 +01:00
parent ecfbe53246
commit 9c35e69c84
2 changed files with 10 additions and 15 deletions

View file

@ -28,19 +28,16 @@
, icalendar , icalendar
, pandas , pandas
, pythonImportsCheckHook , pythonImportsCheckHook
, contourpy
, xyzservices
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "bokeh"; pname = "bokeh";
# update together with panel which is not straightforward # update together with panel which is not straightforward
version = "3.0.3"; version = "2.4.3";
format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash= "sha256-HChHHvXmEQulvtUTE3/SYFTrxEVLx2hlDq7vxTuJioo="; sha256 = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM=";
}; };
patches = [ patches = [
@ -73,10 +70,10 @@ buildPythonPackage rec {
requests requests
nbconvert nbconvert
icalendar icalendar
pandas
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
contourpy
pillow pillow
jinja2 jinja2
python-dateutil python-dateutil
@ -84,10 +81,8 @@ buildPythonPackage rec {
pyyaml pyyaml
tornado tornado
numpy numpy
pandas
packaging packaging
typing-extensions typing-extensions
xyzservices
] ]
++ lib.optionals ( isPy27 ) [ ++ lib.optionals ( isPy27 ) [
futures futures

View file

@ -1,9 +1,9 @@
diff --git a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py diff --git a/bokeh/util/compiler.py b/bokeh/util/compiler.py
index 9af8691..4b93543 100644 index a752aad7d..8af05ff63 100644
--- a/src/bokeh/util/compiler.py --- a/bokeh/util/compiler.py
+++ b/src/bokeh/util/compiler.py +++ b/bokeh/util/compiler.py
@@ -415,8 +415,8 @@ def _detect_nodejs() -> str: @@ -442,8 +442,8 @@ def _detect_nodejs():
raise RuntimeError(f'node.js v{version_repr} or higher is needed to allow compilation of custom models ' + raise RuntimeError('node.js v%s or higher is needed to allow compilation of custom models ' % version +
'("conda install nodejs" or follow https://nodejs.org/en/download/)') '("conda install nodejs" or follow https://nodejs.org/en/download/)')
-_nodejs = None -_nodejs = None
@ -11,5 +11,5 @@ index 9af8691..4b93543 100644
+_nodejs = "@node_bin@" +_nodejs = "@node_bin@"
+_npmjs = "@npm_bin@" +_npmjs = "@npm_bin@"
def _nodejs_path() -> str: def _nodejs_path():
global _nodejs global _nodejs