diff --git a/flake.lock b/flake.lock index 0cda5362..3b5e1971 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1692204152, - "narHash": "sha256-3w/WJLmhpH5eISNMfnsXlVC3NFJx+Dh+C0uiKWKJHcI=", + "lastModified": 1692398574, + "narHash": "sha256-hMD8AtaSv4VYtGt+gtohTC9rr3nq4uWlhkkTlFfnWh0=", "owner": "accentor", "repo": "api", - "rev": "56c15a132bace6f00950e61a18fdaaf9f9d74bef", + "rev": "b701b24f6d5df889fd82fea6f2d146177e6fb7aa", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1692204118, - "narHash": "sha256-EgBE19K7e5BkKcmdDwdbTGuHJ9a4td72x31finb4Tp4=", + "lastModified": 1692398637, + "narHash": "sha256-wdUCOn7Hsqhl4iZMXdsA4F7WjSi9mwGA6/06K8uynMA=", "owner": "accentor", "repo": "web", - "rev": "fb4c1e254b27efb5e60706702ef4d5620edd47a5", + "rev": "cb1947f15807670db86091c652a3b625daf30ef6", "type": "github" }, "original": { @@ -211,11 +211,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1692327983, - "narHash": "sha256-erfp98KitK+0xjoRGkfZ5M2wCifW4TOtoxAte4Jo9QI=", + "lastModified": 1692440668, + "narHash": "sha256-ieBlHDs+01fpQKdaSFSji1fu8v+a7B/5ew8X81fIvDw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f92eaef404ab814e458a9e56f08b0508e0ef73ad", + "rev": "5df91433bba7fecf9394c2e07f3f53b357c4f63a", "type": "github" }, "original": { @@ -431,11 +431,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692174805, - "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=", + "lastModified": 1692356644, + "narHash": "sha256-AYkPFT+CbCVSBmh0WwIzPpwhEJ4Yy3A7JZvUkGJIg5o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e", + "rev": "8ecc900b2f695d74dea35a92f8a9f9b32c8ea33d", "type": "github" }, "original": { @@ -477,11 +477,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1692207601, - "narHash": "sha256-tfPGNKQcJT1cvT6ufqO/7ydYNL6mcJClvzbrzhKjB80=", + "lastModified": 1692339729, + "narHash": "sha256-TUK76/Pqm9qIDjEGd27Lz9EiBIvn5F70JWDmEQ4Y5DQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b30c68669df77d981ce4aefd6b9d378563f6fc4e", + "rev": "ae521bd4e460b076a455dca8b13f4151489a725c", "type": "github" }, "original": { @@ -509,11 +509,11 @@ }, "nur": { "locked": { - "lastModified": 1692339853, - "narHash": "sha256-/DGzJsMfqctIj2uoG0GqaiUf4qHkAqqMGJil59LRV0E=", + "lastModified": 1692437027, + "narHash": "sha256-gWtVFoPw7HhbKGLp7vupVbCNAvNMQS5+2PujOt2QbRk=", "owner": "nix-community", "repo": "NUR", - "rev": "0a03fb4c921d61a02709db585d210b6a0005163e", + "rev": "b47c7b8d313f9739a7fbb572413c959a362c244a", "type": "github" }, "original": { @@ -655,11 +655,11 @@ ] }, "locked": { - "lastModified": 1692207365, - "narHash": "sha256-StHxwMWJD7jG2/ZiJMztkZIA/WR/kx5+rhhybl/RUDc=", + "lastModified": 1692398148, + "narHash": "sha256-LnPEfb2p/iKKxQHcfJEoc4/ulIq3mljvHynY93ryids=", "owner": "chvp", "repo": "tetris", - "rev": "8644e5c95e98f1e0792e731c5de5ffcdd3838a28", + "rev": "b0bc46551eedafb25362f7bda3927b2606d91e90", "type": "github" }, "original": { diff --git a/patches/249696.patch b/patches/249696.patch deleted file mode 100644 index 9706e0ca..00000000 --- a/patches/249696.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix -index 7033bb4af5a32..480e7eac8bddd 100644 ---- a/pkgs/servers/mautrix-whatsapp/default.nix -+++ b/pkgs/servers/mautrix-whatsapp/default.nix -@@ -2,18 +2,18 @@ - - buildGoModule rec { - pname = "mautrix-whatsapp"; -- version = "0.9.0"; -+ version = "0.10.0"; - - src = fetchFromGitHub { - owner = "mautrix"; - repo = "whatsapp"; - rev = "v${version}"; -- hash = "sha256-9o8AjZclSVzpAIqnW28/iaP10pA5cg7eC1q/kbMI3jI="; -+ hash = "sha256-NbIDVBfh/6NXEvQhypOC5ToOq0EEkKKiMMahGJdXX0g="; - }; - - buildInputs = [ olm ]; - -- vendorSha256 = "sha256-Gnr3+653gy3C8G0NSYsjsQFkfDPs013pyl/ARD5yweM="; -+ vendorSha256 = "sha256-5S5uq7CRixw6PvtE4xz+AWfS+VsKE4+JVZjfyXmvbsM="; - - doCheck = false; - diff --git a/patches/249951.patch b/patches/249951.patch new file mode 100644 index 00000000..c0b61a7d --- /dev/null +++ b/patches/249951.patch @@ -0,0 +1,13 @@ +diff --git a/nixos/modules/services/databases/influxdb2.nix b/nixos/modules/services/databases/influxdb2.nix +index 8e3135c9e235e..329533b35dc8e 100644 +--- a/nixos/modules/services/databases/influxdb2.nix ++++ b/nixos/modules/services/databases/influxdb2.nix +@@ -107,7 +107,7 @@ in + LimitNOFILE = 65536; + KillMode = "control-group"; + Restart = "on-failure"; +- LoadCredential = [ ++ LoadCredential = mkIf cfg.provision.enable [ + "admin-password:${cfg.provision.initialSetup.passwordFile}" + "admin-token:${cfg.provision.initialSetup.tokenFile}" + ];