diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-05-03 17:36:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-05-03 17:36:08 +0200 |
| commit | e96601ecf084d9d6a366a4f0da7f36479f67f81e (patch) | |
| tree | dbfe3d477ed9bee7adb03c76ae5fecce043fb9bf /pkgs/development/python-modules/bokeh | |
| parent | 1aae0909b02ffb4d0d4a45db322df7a8c9fdd34e (diff) | |
| parent | 2544167a82ff99e00a8de68fa529701a30648128 (diff) | |
Merge #306080: staging-next 2024-04-22
Diffstat (limited to 'pkgs/development/python-modules/bokeh')
| -rw-r--r-- | pkgs/development/python-modules/bokeh/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 63fa524f9fa30..8f052c4b5b179 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , fetchFromGitHub @@ -8,7 +7,6 @@ , colorama , contourpy , jinja2 -, mock , numpy , nodejs , packaging @@ -48,14 +46,14 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "3.3.4"; + version = "3.4.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-c7eYLcK43xW/Zgzd3I04JegpGVxDgBWl0Jgk8acCg2g="; + hash = "sha256-2CSWHkJlNnsHUM5YsH5WStC4PKZLM1UhzTQh6bnxDYk="; }; src_test = fetchFromGitHub { diff --git a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch index 4ebfc7e3f2d63..6dcec9ae51777 100644 --- a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch +++ b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch @@ -1,14 +1,15 @@ -diff -ru a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py +diff --git a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py +index 4f4314ac8..726610f4c 100644 --- a/src/bokeh/util/compiler.py +++ b/src/bokeh/util/compiler.py -@@ -411,8 +411,8 @@ +@@ -411,8 +411,8 @@ def _detect_nodejs() -> Path: raise RuntimeError(f'node.js v{version_repr} or higher is needed to allow compilation of custom models ' + '("conda install nodejs" or follow https://nodejs.org/en/download/)') --_nodejs = None --_npmjs = None +-_nodejs: Path | None = None +-_npmjs: Path | None = None +_nodejs = "@node_bin@" +_npmjs = "@npm_bin@" - def _nodejs_path() -> str: + def _nodejs_path() -> Path: global _nodejs |