diff --git a/flake.lock b/flake.lock index 9da0c5ae..6c8b19db 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1736146594, - "narHash": "sha256-grY2yscrb3UgqA6kw5APTj+4gJc+TX3/xUH6UqCqY5o=", + "lastModified": 1736412345, + "narHash": "sha256-fOoEKZ2ySTk1576gMR6uuBwzRRppJfaFovWneEqlUYY=", "owner": "accentor", "repo": "api", - "rev": "0deab27bf80df7ccf89d60d7317055d5cdd41d61", + "rev": "302b03efa4800a580bd8de5cdc46c8f6dc473ec3", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1736085891, - "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", + "lastModified": 1736370755, + "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", + "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", "type": "github" }, "original": { @@ -184,11 +184,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1736215843, - "narHash": "sha256-xFcqxrwIBTI+V1XG5BBW3Eg2IAESLq2abFnE+rWc8Vk=", + "lastModified": 1736385356, + "narHash": "sha256-ddNEYJylKbApbxboWk57oq/wkIs3QRYnhDuSgUwG4wE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c4b02b4be54b35b6bf0cd6b33ef01e33b5a041af", + "rev": "b8a53ec5e21526aff929faa711dd22b3d9c5d49b", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1736204492, - "narHash": "sha256-CoBPRgkUex9Iz6qGSzi/BFVUQjndB0PmME2B6eEyeCs=", + "lastModified": 1736366465, + "narHash": "sha256-Fo68EF6p/N9GJyHiAUbXtiE7IJlb3IMjK86LuxFMsRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "20665c6efa83d71020c8730f26706258ba5c6b2a", + "rev": "7e00856596891850ba5ad4c5ecd2ed74468c08c5", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { @@ -350,11 +350,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1736061677, - "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { @@ -373,11 +373,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736256647, - "narHash": "sha256-gKL7eKQ++B3xDGXh6gmckTc4psHCoBL3KZjLgp0kod0=", + "lastModified": 1736412376, + "narHash": "sha256-iuLJ46T8RXLt4aMo//1PvhRJuwcBtvV67stg7XpsbvQ=", "owner": "nix-community", "repo": "NUR", - "rev": "3039f5207715711c24df9867ec3bbf507edb648d", + "rev": "6ac8fe2ae1bff7d46688f78f791d49a8e08b014b", "type": "github" }, "original": { @@ -434,11 +434,11 @@ ] }, "locked": { - "lastModified": 1736145952, - "narHash": "sha256-P/0sA9jkcjfEywIiuKFbHuXRp0ngC4aOsl3Le1u3d9k=", + "lastModified": 1736412129, + "narHash": "sha256-0OZQ9HK2akkNItY64YEIyYF6peUZRb7vW8PbRN4ni3U=", "owner": "chvp", "repo": "tetris", - "rev": "6218716ce6a1e03713874c60e71b6d63a26a12e5", + "rev": "4a936546efcb8134f236cc78337d336acb4d20c6", "type": "github" }, "original": { diff --git a/patches/369859.patch b/patches/369859.patch deleted file mode 100644 index cbf71f23..00000000 --- a/patches/369859.patch +++ /dev/null @@ -1,26 +0,0 @@ -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; -