diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix | |
parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix b/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix index 69721aeb8280..665167e290ea 100644 --- a/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix @@ -28,22 +28,21 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.18.7"; + version = "0.19.0"; format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - hash = "sha256-eti9kvfv3y7m+mJzcxftyn8OyVSd2Ehqd3eU2ezMV5Q="; + hash = "sha256-+WZk2m05y/bYj8zSuWTzm+rnCC0L9H9WNQ2RLXv7hDk="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' - # Remove after https://github.com/poljar/matrix-nio/pull/288 - substituteInPlace pyproject.toml \ - --replace 'aiohttp-socks = "^0.6.0"' 'aiohttp-socks = "^0.7.0"' + --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' \ + --replace 'jsonschema = "^3.2.0"' 'jsonschema = "*"' \ + --replace 'cachetools = { version = "^4.2.1", optional = true }' 'cachetools = { version = "*", optional = true }' ''; nativeBuildInputs = [ |