diff --git a/pkgs/development/python-modules/pyecharts/default.nix b/pkgs/development/python-modules/pyecharts/default.nix index b3d04bbfc070..d2b09be15f82 100644 --- a/pkgs/development/python-modules/pyecharts/default.nix +++ b/pkgs/development/python-modules/pyecharts/default.nix @@ -8,7 +8,6 @@ pillow, prettytable, pytestCheckHook, - pythonOlder, requests, setuptools, simplejson, @@ -19,8 +18,6 @@ buildPythonPackage rec { version = "2.0.9"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "pyecharts"; repo = "pyecharts"; @@ -60,7 +57,7 @@ buildPythonPackage rec { meta = { description = "Python Echarts Plotting Library"; homepage = "https://github.com/pyecharts/pyecharts"; - changelog = "https://github.com/pyecharts/pyecharts/releases/tag/v${version}"; + changelog = "https://github.com/pyecharts/pyecharts/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/streamlit-echarts/default.nix b/pkgs/development/python-modules/streamlit-echarts/default.nix new file mode 100644 index 000000000000..b0032853b100 --- /dev/null +++ b/pkgs/development/python-modules/streamlit-echarts/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pyecharts, + setuptools, + streamlit, +}: + +buildPythonPackage rec { + pname = "streamlit-echarts"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "andfanilo"; + repo = "streamlit-echarts"; + tag = "v${version}"; + hash = "sha256-VNliCZPkAYUx+TacBc6PrS4C4bjM5fmVx/Sj6aSw2Yc="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pyecharts + streamlit + ]; + + pythonImportsCheck = [ "streamlit_echarts" ]; + + # Module has no tests + doCheck = false; + + meta = { + description = "Streamlit component to render ECharts"; + homepage = "https://github.com/andfanilo/streamlit-echarts"; + changelog = "https://github.com/andfanilo/streamlit-echarts/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ce0749780a0..80fc70c67757 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18200,6 +18200,8 @@ self: super: with self; { streamlit-card = callPackage ../development/python-modules/streamlit-card { }; + streamlit-echarts = callPackage ../development/python-modules/streamlit-echarts { }; + streamlit-folium = callPackage ../development/python-modules/streamlit-folium { }; streamlit-kpi-card = callPackage ../development/python-modules/streamlit-kpi-card { };