Update dependencies
This commit is contained in:
parent
0066bcfced
commit
a07c089e4d
3 changed files with 91 additions and 37 deletions
26
patches/369859.patch
Normal file
26
patches/369859.patch
Normal file
|
@ -0,0 +1,26 @@
|
|||
diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix
|
||||
index 621f703992968..42cf63079fdbf 100644
|
||||
--- a/pkgs/development/python-modules/pysaml2/default.nix
|
||||
+++ b/pkgs/development/python-modules/pysaml2/default.nix
|
||||
@@ -97,5 +97,8 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/IdentityPython/pysaml2/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
+ # Does not support pyopenssl above 24.3.0 due to use of a deprecated API,
|
||||
+ # see https://github.com/IdentityPython/pysaml2/issues/975
|
||||
+ broken = true;
|
||||
};
|
||||
}
|
||||
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
|
||||
index a1f78d9a21585..79b5cdc861a5b 100644
|
||||
--- a/pkgs/servers/matrix-synapse/default.nix
|
||||
+++ b/pkgs/servers/matrix-synapse/default.nix
|
||||
@@ -149,7 +149,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
mock
|
||||
parameterized
|
||||
])
|
||||
- ++ lib.flatten (lib.attrValues optional-dependencies);
|
||||
+ ++ builtins.filter (p: !p.meta.broken) (lib.flatten (lib.attrValues optional-dependencies));
|
||||
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
28
patches/371815.patch
Normal file
28
patches/371815.patch
Normal file
|
@ -0,0 +1,28 @@
|
|||
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
|
||||
index 79b5cdc861a5b..422097f9e490d 100644
|
||||
--- a/pkgs/servers/matrix-synapse/default.nix
|
||||
+++ b/pkgs/servers/matrix-synapse/default.nix
|
||||
@@ -10,6 +10,7 @@
|
||||
rustc,
|
||||
nixosTests,
|
||||
callPackage,
|
||||
+ fetchpatch2,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -34,6 +35,15 @@ python3.pkgs.buildPythonApplication rec {
|
||||
hash = "sha256-LGFuz3NtNqH+XumJOirvflH0fyfTtqz5qgYlJx2fmAU=";
|
||||
};
|
||||
|
||||
+ patches = [
|
||||
+ # Fixes test compat with twisted 24.11.0.
|
||||
+ # Can be removed in next release.
|
||||
+ (fetchpatch2 {
|
||||
+ url = "https://github.com/element-hq/synapse/commit/3eb92369ca14012a07da2fbf9250e66f66afb710.patch";
|
||||
+ sha256 = "sha256-VDn3kQy23+QC2WKhWfe0FrUOnLuI1YwH5GxdTTVWt+A=";
|
||||
+ })
|
||||
+ ];
|
||||
+
|
||||
postPatch = ''
|
||||
# Remove setuptools_rust from runtime dependencies
|
||||
# https://github.com/element-hq/synapse/blob/v1.69.0/pyproject.toml#L177-L185
|
Loading…
Add table
Add a link
Reference in a new issue