Update dependencies
All checks were successful
Cachix / build (elendel) (push) Successful in 1m43s
Cachix / build (kholinar) (push) Successful in 2m9s
Cachix / build (marabethia) (push) Successful in 1m32s

This commit is contained in:
Charlotte Van Petegem 2025-01-13 13:35:07 +01:00
parent 4d82bca8b1
commit 3e40fc4ba1
3 changed files with 14 additions and 52 deletions

26
flake.lock generated
View file

@ -319,11 +319,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1736523798,
"narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=",
"lastModified": 1736701207,
"narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "130595eba61081acde9001f43de3248d8888ac4a",
"rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6",
"type": "github"
},
"original": {
@ -373,11 +373,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1736755461,
"narHash": "sha256-sSD+ITN1CuOnUMPU2VmLmZno963ydG/oKV+4TrMjGRE=",
"lastModified": 1736768758,
"narHash": "sha256-pSHpW/nL+8AYw26RHQxbSfZ2YmGodd+18nsCPPR2ark=",
"owner": "nix-community",
"repo": "NUR",
"rev": "e7493220ca728cb9d9df1a04ab681427e3ad88e9",
"rev": "cfea7e60ad3654bb6ac3a5e8b850a000d59a2c0e",
"type": "github"
},
"original": {
@ -434,11 +434,11 @@
]
},
"locked": {
"lastModified": 1736674595,
"narHash": "sha256-TTEPlIYdfKWXSnzTN9FD7XA4o6V527icy3l5LZ0drek=",
"lastModified": 1736768239,
"narHash": "sha256-nH093lnOAsXq9VHnCLCjcbAh93uN2Mj6DIdS5vv4MkA=",
"owner": "chvp",
"repo": "tetris",
"rev": "b6aa26f3c53f8c2e5bc4071afff7d580b70fb413",
"rev": "c4320c474183163abc94a1f0c54cc6727c521f8d",
"type": "github"
},
"original": {
@ -484,11 +484,11 @@
]
},
"locked": {
"lastModified": 1736674576,
"narHash": "sha256-oxNSw8s5F3dY5SiZ7Or+3vDDHj/ASXQUAqEqgZ8AiOk=",
"lastModified": 1736768177,
"narHash": "sha256-pym5jAlhD8Hd5w40zI0ItjASCXGXQsK1Adjk7B+/v8A=",
"ref": "refs/heads/main",
"rev": "ad08d942cb590c974bfbd69b520483c38a34f4a2",
"revCount": 56,
"rev": "aa60e6b3f5d0c679f6dcf834cb0b58ae7b733c78",
"revCount": 57,
"type": "git",
"url": "https://git.chvp.be/chvp/www.chvp.be"
},

View file

@ -134,6 +134,7 @@
darwinModules = [
agenix.darwinModules.default
home-manager.darwinModules.default
nix-index-database.darwinModules.nix-index
./modules/darwin
];
nixosSystem = system: name:

View file

@ -1,39 +0,0 @@
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 79b5cdc861a5b..db9ba29a0c828 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
@@ -47,6 +57,10 @@ python3.pkgs.buildPythonApplication rec {
# Don't force pillow to be 10.0.1 because we already have patched it, and
# we don't use the pillow wheels.
sed -i 's/Pillow = ".*"/Pillow = ">=5.4.0"/' pyproject.toml
+
+ # https://github.com/element-hq/synapse/pull/17878#issuecomment-2575412821
+ substituteInPlace tests/storage/databases/main/test_events_worker.py \
+ --replace-fail "def test_recovery" "def no_test_recovery"
'';
nativeBuildInputs = with python3.pkgs; [