diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/python-modules/flet | |
parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/flet')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/flet/default.nix | 12 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/flet/pyproject.toml.patch | 11 |
2 files changed, 7 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/flet/default.nix b/nixpkgs/pkgs/development/python-modules/flet/default.nix index af5600e1c98b..95382a88c95c 100644 --- a/nixpkgs/pkgs/development/python-modules/flet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flet/default.nix @@ -6,17 +6,19 @@ buildPythonPackage rec { pname = "flet"; - version = "0.6.2"; + version = "0.7.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-EDNATwO2N4jXVC5H1VmXqC9XGTnQo8vLvTEozRYZuj4="; + hash = "sha256-vFPjN+5wIygtP035odAOSdF9PQe6eXz6CJ9Q0d8ScFo="; }; - patches = [ - ./pyproject.toml.patch - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'httpx = "^0.23' 'httpx = ">=0.23' \ + --replace 'watchdog = "^2' 'watchdog = ">=2' + ''; nativeBuildInputs = with python3.pkgs; [ poetry-core diff --git a/nixpkgs/pkgs/development/python-modules/flet/pyproject.toml.patch b/nixpkgs/pkgs/development/python-modules/flet/pyproject.toml.patch deleted file mode 100644 index 7f8a66f88967..000000000000 --- a/nixpkgs/pkgs/development/python-modules/flet/pyproject.toml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -20,7 +20,7 @@ flet-core = "0.6.2" - python = "^3.7" - typing-extensions = { version = "^4.4.0", python = "<3.8" } - websocket-client = "^1.4.2" --watchdog = "^2.2.1" -+watchdog = ">=2.2.1" - oauthlib = "^3.2.2" - websockets = "^10.4" - httpx = "^0.23.3" |