diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix similarity index 71% rename from pkgs/applications/science/machine-learning/streamlit/default.nix rename to pkgs/development/python-modules/streamlit/default.nix index 36b03152f787..2ab4d11e640d 100755 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -1,38 +1,43 @@ { lib +, stdenv , altair , blinker -, buildPythonApplication +, buildPythonPackage , cachetools , click , fetchPypi , gitpython , importlib-metadata -, jinja2 +, numpy +, packaging +, pandas , pillow , protobuf3 , pyarrow , pydeck , pympler +, python-dateutil +, pythonOlder , requests , rich -, semver -, setuptools , tenacity , toml -, tornado +, typing-extensions , tzlocal , validators , watchdog }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "streamlit"; - version = "1.24.0"; + version = "1.24.1"; format = "setuptools"; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version format; - hash = "sha256-NSX6zpTHh5JzPFbWOja0iEUVDjume7UKGa20xZdagiU="; + hash = "sha256-/V8LZHmOlwY2RAj7WJt3WVMUpjFdE7LXULljx66X82I="; }; propagatedBuildInputs = [ @@ -42,21 +47,23 @@ buildPythonApplication rec { click gitpython importlib-metadata - jinja2 + numpy + packaging + pandas pillow protobuf3 pyarrow pydeck pympler + python-dateutil requests rich - semver - setuptools tenacity toml - tornado + typing-extensions tzlocal validators + ] ++ lib.optionals (!stdenv.isDarwin) [ watchdog ]; @@ -75,7 +82,7 @@ buildPythonApplication rec { homepage = "https://streamlit.io/"; changelog = "https://github.com/streamlit/streamlit/releases/tag/${version}"; description = "The fastest way to build custom ML tools"; - maintainers = with maintainers; [ yrashk ]; + maintainers = with maintainers; [ natsukium yrashk ]; license = licenses.asl20; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5375a739e137..293685de53a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38016,8 +38016,6 @@ with pkgs; stone-kingdoms = callPackage ../games/stone-kingdoms { }; - streamlit = python3Packages.callPackage ../applications/science/machine-learning/streamlit { }; - stt = callPackage ../tools/audio/stt { }; stuntrally = callPackage ../games/stuntrally @@ -38752,6 +38750,8 @@ with pkgs; sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { }; + streamlit = with python3Packages; toPythonApplication streamlit; + uarmsolver = callPackage ../applications/science/machine-learning/uarmsolver { }; ### SCIENCE/MATH diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c8b32b1e8b7..1396311cc2e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12170,6 +12170,8 @@ self: super: with self; { streamlabswater = callPackage ../development/python-modules/streamlabswater { }; + streamlit = callPackage ../development/python-modules/streamlit { }; + streamz = callPackage ../development/python-modules/streamz { }; strenum = callPackage ../development/python-modules/strenum { };