about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-12-08 21:53:43 +0100
committerGitHub <noreply@github.com>2023-12-08 21:53:43 +0100
commitd25ac008edccd6ae6fb9982c93dde1487406e339 (patch)
tree4f386cc9d728f5403c121fca630a7358b578129c /pkgs
parent47aff944e4c09ac53434dc0d5d83a9c0ea564163 (diff)
parent58bdc141c60c09c8bbfb33b8bf9cf0ecb69d6b81 (diff)
downloadnixlib-d25ac008edccd6ae6fb9982c93dde1487406e339.tar
nixlib-d25ac008edccd6ae6fb9982c93dde1487406e339.tar.gz
nixlib-d25ac008edccd6ae6fb9982c93dde1487406e339.tar.bz2
nixlib-d25ac008edccd6ae6fb9982c93dde1487406e339.tar.lz
nixlib-d25ac008edccd6ae6fb9982c93dde1487406e339.tar.xz
nixlib-d25ac008edccd6ae6fb9982c93dde1487406e339.tar.zst
nixlib-d25ac008edccd6ae6fb9982c93dde1487406e339.zip
Merge pull request #272905 from wegank/flet-bump
python311Packages.flet: 0.10.1 -> 0.15.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/flet-core/default.nix5
-rw-r--r--pkgs/development/python-modules/flet-runtime/default.nix42
-rw-r--r--pkgs/development/python-modules/flet/default.nix18
-rw-r--r--pkgs/top-level/python-packages.nix2
4 files changed, 55 insertions, 12 deletions
diff --git a/pkgs/development/python-modules/flet-core/default.nix b/pkgs/development/python-modules/flet-core/default.nix
index bf1e8b2d693a..c8a8d678717c 100644
--- a/pkgs/development/python-modules/flet-core/default.nix
+++ b/pkgs/development/python-modules/flet-core/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "flet-core";
-  version = "0.10.1";
+  version = "0.15.0";
   format = "pyproject";
 
   src = fetchPypi {
     pname = "flet_core";
     inherit version;
-    hash = "sha256-YLtHnKBlXkUJJkQzxnDkfl6+gSGm05GXYPGEU3XO/jI=";
+    hash = "sha256-nmQHWyLlyo6CVzn+dlTSnA10XRoSFBLEeYdcWpfoGBo=";
   };
 
   nativeBuildInputs = [
@@ -33,6 +33,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
+    changelog = "https://github.com/flet-dev/flet/releases/tag/v${version}";
     description = "The library is the foundation of Flet framework and is not intended to be used directly";
     homepage = "https://flet.dev/";
     license = lib.licenses.asl20;
diff --git a/pkgs/development/python-modules/flet-runtime/default.nix b/pkgs/development/python-modules/flet-runtime/default.nix
new file mode 100644
index 000000000000..b4754b911b4c
--- /dev/null
+++ b/pkgs/development/python-modules/flet-runtime/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, poetry-core
+, flet-core
+, httpx
+, oauthlib
+}:
+
+buildPythonPackage rec {
+  pname = "flet-runtime";
+  version = "0.15.0";
+  format = "pyproject";
+
+  src = fetchPypi {
+    pname = "flet_runtime";
+    inherit version;
+    hash = "sha256-CRrAz1V6bISgL2MU7ibhhNEB5IdiQKjRdIt2dmZh0h4=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    flet-core
+    httpx
+    oauthlib
+  ];
+
+  pythonImportsCheck = [
+    "flet_runtime"
+  ];
+
+  meta = {
+    changelog = "https://github.com/flet-dev/flet/releases/tag/v${version}";
+    description = "A base package for Flet desktop and Flet mobile";
+    homepage = "https://flet.dev/";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.wegank ];
+  };
+}
diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix
index c6541372d66b..8608e77bb5e2 100644
--- a/pkgs/development/python-modules/flet/default.nix
+++ b/pkgs/development/python-modules/flet/default.nix
@@ -7,10 +7,12 @@
 
 # propagates
 , flet-core
+, flet-runtime
 , httpx
 , oauthlib
 , packaging
-, typing-extensions
+, qrcode
+, rich
 , watchdog
 , websocket-client
 , websockets
@@ -19,33 +21,29 @@
 
 buildPythonPackage rec {
   pname = "flet";
-  version = "0.10.1";
+  version = "0.15.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Ogy4F9/beSb3GCpwPsN+8hsVroRoHTSojqg+5eXwcRI=";
+    hash = "sha256-NnozZX8i5QsnVRW5cyIvKxYuHf9EoR6owWSQw6Y4dwQ=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'httpx = "^0.23' 'httpx = ">=0.23' \
-      --replace 'watchdog = "^2' 'watchdog = ">=2'
-  '';
-
   nativeBuildInputs = [
     poetry-core
   ];
 
   propagatedBuildInputs = [
     flet-core
-    typing-extensions
+    flet-runtime
     websocket-client
     watchdog
     oauthlib
     websockets
     httpx
     packaging
+    qrcode
+    rich
   ];
 
   doCheck = false;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bc47bcbc48c3..075586b9db5c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4146,6 +4146,8 @@ self: super: with self; {
 
   flet-core = callPackage ../development/python-modules/flet-core { };
 
+  flet-runtime = callPackage ../development/python-modules/flet-runtime { };
+
   flexmock = callPackage ../development/python-modules/flexmock { };
 
   flickrapi = callPackage ../development/python-modules/flickrapi { };