diff --git a/flake.lock b/flake.lock index 78904b42..e2c652e6 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1684547736, - "narHash": "sha256-O+yFLoe4qFF0fUh5Fs6lMCSG6234nVLQ/lQZDavIaEM=", + "lastModified": 1684593643, + "narHash": "sha256-dQTQJvJ3sRWGPPGyBZZbA8r3IgJ5Cz12Rs7e6TxG36s=", "owner": "accentor", "repo": "api", - "rev": "6c39b2fcc287e1d402f6c13ca7ddc0f7f4e74ae4", + "rev": "271c2b9e52bbbbc7062199bf6b97ba8ab08275f4", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1684561280, - "narHash": "sha256-lwmwujPKF5vOGdFLybirU5KJniDtNHo1TRucPFSxL4c=", + "lastModified": 1684593716, + "narHash": "sha256-wmaO1PMD0RfB0R4H8pWz+70xQQbj0ArMU0rs4wXY2QM=", "owner": "accentor", "repo": "web", - "rev": "9e6833dd2f66d0224214c73158cf547dba609550", + "rev": "7fed462f62d78971b73150b61a9cc5855840311b", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1684573873, - "narHash": "sha256-Quke+BYe/x94IdW6Uicc+Njdpyu62LJ78PO0xzb7t8c=", + "lastModified": 1684640313, + "narHash": "sha256-qBbw1WeFcjOjKB1WCzcS/mu2POmk1drpfjJk6tZMkbQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0bd4cb5ef11985ad1eb6f6ad7e24d0cd86e91dd5", + "rev": "25cbd5b0f32cab75356a0a8e73aa2913529db36a", "type": "github" }, "original": { @@ -233,11 +233,11 @@ ] }, "locked": { - "lastModified": 1684484967, - "narHash": "sha256-P3ftCqeJmDYS9LSr2gGC4XGGcp5vv8TOasJX6fVHWsw=", + "lastModified": 1684596126, + "narHash": "sha256-4RZZmygeEXpuBqEXGs38ZAcWjWKGwu13Iqbxub6wuJk=", "owner": "nix-community", "repo": "home-manager", - "rev": "b9a52ad20e58ebd003444915e35e3dd2c18fc715", + "rev": "27ef11f0218d9018ebb2948d40133df2b1de622d", "type": "github" }, "original": { @@ -294,11 +294,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684481515, - "narHash": "sha256-sDMEZ4HLP6sVNiBcgla3KWihdDjh67DP5ZWkGKWFgY0=", + "lastModified": 1684570954, + "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b1bc788f578cd83d54b48bb057d6f6703ae7725", + "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3", "type": "github" }, "original": { @@ -325,11 +325,11 @@ }, "nur": { "locked": { - "lastModified": 1684572185, - "narHash": "sha256-dDssxsmmWaD256+OpeHvkxq82BnLYwtJaoE5GNKBXRQ=", + "lastModified": 1684653837, + "narHash": "sha256-oDulHp8rXwt5HRubROrDDy/84dma6qFmLSaSgF1YtSY=", "owner": "nix-community", "repo": "NUR", - "rev": "e7fed5a8ca91d460178cde4f73458e0dda45faef", + "rev": "a32e3e24fec94840edf29e48195011cd4842576c", "type": "github" }, "original": { @@ -384,11 +384,11 @@ ] }, "locked": { - "lastModified": 1684547221, - "narHash": "sha256-l759GW0IZ1k5nx3V/4gE6FIem/bHAlM7gfHua24f3ac=", + "lastModified": 1684593319, + "narHash": "sha256-g/xgwGog8K/NhCznizAXQxFncZ07iKKBoDXHS95toE8=", "owner": "chvp", "repo": "tetris", - "rev": "2fd2b6841b0ddfcc921846330373848f6e5de74d", + "rev": "87c7a1d055c91ce91c69f4b8c33c4e954066b5f4", "type": "github" }, "original": { diff --git a/modules/services/mastodon/default.nix b/modules/services/mastodon/default.nix index ab810917..b82ab4ed 100644 --- a/modules/services/mastodon/default.nix +++ b/modules/services/mastodon/default.nix @@ -7,6 +7,8 @@ }; config = lib.mkIf config.chvp.services.mastodon.enable { + # :'( + nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1t" ]; chvp.services.nginx.hosts = [{ fqdn = "social.chvp.be"; options = { diff --git a/patches/232277.patch b/patches/232277.patch deleted file mode 100644 index a4f2902c..00000000 --- a/patches/232277.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e217274f2eac8ad1c043503c0c440cf99b056c2f Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Tue, 16 May 2023 19:45:47 +0200 -Subject: [PATCH] mautrix-whatsapp: 0.8.4 -> 0.8.5 - -https://github.com/mautrix/whatsapp/releases/tag/v0.8.5 ---- - pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix -index 6e537b88ec7f2..cfde1959028de 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.8.4"; -+ version = "0.8.5"; - - src = fetchFromGitHub { - owner = "mautrix"; - repo = "whatsapp"; - rev = "v${version}"; -- hash = "sha256-4dOkSnurg2Sk36Z2WNjPaO092IiRlzc9oWM6sQ+wUwM="; -+ hash = "sha256-XiDuH4W5yghbT2wIcqcC2y1qJH62mWvTk6ca3KedkIk="; - }; - - buildInputs = [ olm ]; - -- vendorSha256 = "sha256-48C9aaOe148emSsxzfKFKtnXyC39IFO8Ge7d+rIhDac="; -+ vendorSha256 = "sha256-m9wB6u76ONw0+mZeCnwEYOqBvghil+rcKUJFKRaT5Nk="; - - doCheck = false; -