From edc5d13ef3d37c60b3a35b68463b5cd25f9f50e7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 10 Jul 2023 12:05:54 +0900 Subject: [PATCH 1/4] streamlit: manage as python-modules --- .../python-modules}/streamlit/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) rename pkgs/{applications/science/machine-learning => development/python-modules}/streamlit/default.nix (95%) diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix similarity index 95% rename from pkgs/applications/science/machine-learning/streamlit/default.nix rename to pkgs/development/python-modules/streamlit/default.nix index 36b03152f787..29a3499bbf86 100755 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -1,7 +1,7 @@ { lib , altair , blinker -, buildPythonApplication +, buildPythonPackage , cachetools , click , fetchPypi @@ -25,7 +25,7 @@ , watchdog }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "streamlit"; version = "1.24.0"; format = "setuptools"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e332ce77927..6901050bd27a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38022,8 +38022,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 @@ -38758,6 +38756,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 { }; From 24d17589ebfa816042de98df37d6a1091f6b5b39 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 10 Jul 2023 12:25:08 +0900 Subject: [PATCH 2/4] python310Packages.streamlit: 1.24.0 -> 1.24.1 Changelog: https://github.com/streamlit/streamlit/releases/tag/1.24.1 --- pkgs/development/python-modules/streamlit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 29a3499bbf86..c15292aeccc8 100755 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.24.0"; + version = "1.24.1"; format = "setuptools"; src = fetchPypi { inherit pname version format; - hash = "sha256-NSX6zpTHh5JzPFbWOja0iEUVDjume7UKGa20xZdagiU="; + hash = "sha256-/V8LZHmOlwY2RAj7WJt3WVMUpjFdE7LXULljx66X82I="; }; propagatedBuildInputs = [ From 3cb0c7d55e591700d6175014fcac802515ab865a Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 10 Jul 2023 12:51:46 +0900 Subject: [PATCH 3/4] python310Packages.streamlit: clean up inputs --- .../python-modules/streamlit/default.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index c15292aeccc8..152156e90e37 100755 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , altair , blinker , buildPythonPackage @@ -7,19 +8,21 @@ , 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 @@ -30,6 +33,8 @@ buildPythonPackage rec { version = "1.24.1"; format = "setuptools"; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version format; hash = "sha256-/V8LZHmOlwY2RAj7WJt3WVMUpjFdE7LXULljx66X82I="; @@ -42,21 +47,23 @@ buildPythonPackage 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 ]; From 7d573d6a905b15cc64159b6512b0a863be748048 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 10 Jul 2023 12:52:25 +0900 Subject: [PATCH 4/4] python310Packages.streamlit: add natsukium as maintainer --- pkgs/development/python-modules/streamlit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 152156e90e37..2ab4d11e640d 100755 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -82,7 +82,7 @@ buildPythonPackage 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; }; }