Update dependencies
Some checks failed
Cachix / build (elendel) (push) Successful in 1m27s
Cachix / build (kholinar) (push) Successful in 2m3s
Cachix / build (marabethia) (push) Failing after 3m55s

This commit is contained in:
Charlotte Van Petegem 2025-01-07 15:18:26 +01:00
parent 0066bcfced
commit a07c089e4d
3 changed files with 91 additions and 37 deletions

74
flake.lock generated
View file

@ -45,11 +45,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734836928, "lastModified": 1736146594,
"narHash": "sha256-tyiZPqyJ8eB5jpetRrJk6CztN18wm0epG+7zFA2EtBU=", "narHash": "sha256-grY2yscrb3UgqA6kw5APTj+4gJc+TX3/xUH6UqCqY5o=",
"owner": "accentor", "owner": "accentor",
"repo": "api", "repo": "api",
"rev": "f0d0b597dc580e61bd6e15ac541de8c20aea5ed3", "rev": "0deab27bf80df7ccf89d60d7317055d5cdd41d61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -74,11 +74,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734837100, "lastModified": 1736146337,
"narHash": "sha256-iRU4FiRlerWVWc4z4fioc2/lBRwxyUKfJiGAwRUYuRs=", "narHash": "sha256-Dx6vlOfIM3GKYPRyx38uWSX9WUAlse1u2F4PtR0lrpI=",
"owner": "accentor", "owner": "accentor",
"repo": "web", "repo": "web",
"rev": "158a6b3bf9ed7782a726f583046d622762ae7d37", "rev": "ad70a8ab4425c96a3f386e85671c2a2b2edb7320",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -139,11 +139,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735218083, "lastModified": 1736085891,
"narHash": "sha256-MoUAbmXz9TEr7zlKDRO56DBJHe30+7B5X7nhXm+Vpc8=", "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "bc03f7818771a75716966ce8c23110b715eff2aa", "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,11 +184,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1735316431, "lastModified": 1736215843,
"narHash": "sha256-3YQy5t1oB0CRiJtujBoEZELaE5sjorO27jtPZZJ6Ltc=", "narHash": "sha256-xFcqxrwIBTI+V1XG5BBW3Eg2IAESLq2abFnE+rWc8Vk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "58e0e1b766896cacd34d6183d4f272a21c4605e0", "rev": "c4b02b4be54b35b6bf0cd6b33ef01e33b5a041af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -261,11 +261,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735053786, "lastModified": 1736204492,
"narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", "narHash": "sha256-CoBPRgkUex9Iz6qGSzi/BFVUQjndB0PmME2B6eEyeCs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", "rev": "20665c6efa83d71020c8730f26706258ba5c6b2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -281,11 +281,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735222882, "lastModified": 1736047960,
"narHash": "sha256-kWNi45/mRjQMG+UpaZQ7KyPavYrKfle3WgLn9YeBBVg=", "narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "7e3246f6ad43b44bc1c16d580d7bf6467f971530", "rev": "816a6ae88774ba7e74314830546c29e134e0dffb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -304,11 +304,11 @@
"nixpkgs-24_11": "nixpkgs-24_11" "nixpkgs-24_11": "nixpkgs-24_11"
}, },
"locked": { "locked": {
"lastModified": 1734884447, "lastModified": 1735230346,
"narHash": "sha256-HA9fAmGNGf0cOYrhgoa+B6BxNVqGAYXfLyx8zIS0ZBY=", "narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "63209b1def2c9fc891ad271f474a3464a5833294", "rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -319,11 +319,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1734649271, "lastModified": 1736012469,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,11 +350,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1735141468, "lastModified": 1736061677,
"narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=", "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce", "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,11 +373,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1735317558, "lastModified": 1736256647,
"narHash": "sha256-L9XE69JY8kiJnh0ix6P/JpK2Jc2lI8ZMqtWkg/o4RRM=", "narHash": "sha256-gKL7eKQ++B3xDGXh6gmckTc4psHCoBL3KZjLgp0kod0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "6e183e5c3a9d695d63b7eeb69605f6bc3f5d44df", "rev": "3039f5207715711c24df9867ec3bbf507edb648d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -434,11 +434,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734836808, "lastModified": 1736145952,
"narHash": "sha256-w6pezkBSAOCkQuE9JWR9RODwbYGZGfHTd88+y88UO98=", "narHash": "sha256-P/0sA9jkcjfEywIiuKFbHuXRp0ngC4aOsl3Le1u3d9k=",
"owner": "chvp", "owner": "chvp",
"repo": "tetris", "repo": "tetris",
"rev": "230daa3e8c3ba573190dcc5a5b3605042960e9de", "rev": "6218716ce6a1e03713874c60e71b6d63a26a12e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -484,11 +484,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734838566, "lastModified": 1736148988,
"narHash": "sha256-XD6x6Kl7FrOOCm1U8i13pMDyUkxmtwDZs7/BsSCkLmo=", "narHash": "sha256-vSckGIsYXl+bBTHE+IYOtUca9K5brkS9Kai92mk7FGg=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "20ca89ce6f2ba24b28bcedcdfca2c04ab7fc7224", "rev": "9989d93eebf5eb705564e5f98cc08c4c25d87a6d",
"revCount": 49, "revCount": 54,
"type": "git", "type": "git",
"url": "https://git.chvp.be/chvp/www.chvp.be" "url": "https://git.chvp.be/chvp/www.chvp.be"
}, },

26
patches/369859.patch Normal file
View 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
View 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