From 01b0327ca0ac865256b8995f5c8725f9f4f2e2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= Date: Sun, 17 Sep 2023 21:25:14 +0200 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'deploy-rs': 'github:serokell/deploy-rs/724463b5a94daa810abfc64a4f87faef4e00f984' (2023-06-14) → 'github:serokell/deploy-rs/31c32fb2959103a796e07bbe47e0a5e287c343a8' (2023-09-12) • Updated input 'foundryvtt': 'github:reckenrode/nix-foundryvtt/440d3502d17c45d8dfeee5c1833d1ff03525a07b' (2023-07-06) → 'github:reckenrode/nix-foundryvtt/3358ccef0ea3e06faabe8c54761fb8a0862b80d4' (2023-08-10) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/f3fbbc36b4e179a5985b9ab12624e9dfe7989341' (2023-07-26) → 'github:nixos/nixpkgs/5d017a8822e0907fb96f7700a319f9fe2434de02' (2023-09-17) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/ef99fa5c5ed624460217c31ac4271cfb5cb2502c' (2023-07-25) → 'github:nixos/nixpkgs/ace5093e36ab1e95cb9463863491bee90d5a4183' (2023-09-15) • Updated input 'nvfetcher': 'github:berberman/nvfetcher/44196458acc2c28c32e456c50277d6148e71e708' (2023-06-22) → 'github:berberman/nvfetcher/2bcf73dea96497ac9c36ed320b457caa705f9485' (2023-09-01) • Updated input 'nvfetcher/flake-utils': 'github:numtide/flake-utils/abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c' (2023-06-19) → 'github:numtide/flake-utils/f9e7cf818399d17d347f847525c5a5a8032e4e44' (2023-08-23) • Updated input 'sops-nix': 'github:Mic92/sops-nix/c36df4fe4bf4bb87759b1891cab21e7a05219500' (2023-07-24) → 'github:Mic92/sops-nix/ea208e55f8742fdcc0986b256bdfa8986f5e4415' (2023-09-12) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/ce45b591975d070044ca24e3003c830d26fea1c8' (2023-07-22) → 'github:NixOS/nixpkgs/5601118d39ca9105f8e7b39d4c221d3388c0419d' (2023-09-02) --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 590dec9..b64bc75 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1686747123, - "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=", + "lastModified": 1694513707, + "narHash": "sha256-wE5kHco3+FQjc+MwTPwLVqYz4hM7uno2CgXDXUFMCpc=", "owner": "serokell", "repo": "deploy-rs", - "rev": "724463b5a94daa810abfc64a4f87faef4e00f984", + "rev": "31c32fb2959103a796e07bbe47e0a5e287c343a8", "type": "github" }, "original": { @@ -232,11 +232,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1688686059, - "narHash": "sha256-1q+xdGil+mVkIMHovLv8bkXvwLjk92X6t0bvTpZVYb0=", + "lastModified": 1691701569, + "narHash": "sha256-7TK+sO+JC37OGTQDTiz9TriqbB5yTgoo7fyPyLtWvd8=", "owner": "reckenrode", "repo": "nix-foundryvtt", - "rev": "440d3502d17c45d8dfeee5c1833d1ff03525a07b", + "rev": "3358ccef0ea3e06faabe8c54761fb8a0862b80d4", "type": "github" }, "original": { @@ -361,11 +361,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1690066826, - "narHash": "sha256-6L2qb+Zc0BFkh72OS9uuX637gniOjzU6qCDBpjB2LGY=", + "lastModified": 1693675694, + "narHash": "sha256-2pIOyQwGyy2FtFAUIb8YeKVmOCcPOTVphbAvmshudLE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce45b591975d070044ca24e3003c830d26fea1c8", + "rev": "5601118d39ca9105f8e7b39d4c221d3388c0419d", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1690272529, - "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", + "lastModified": 1694767346, + "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", + "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", "type": "github" }, "original": { @@ -408,11 +408,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1690370995, - "narHash": "sha256-9z//23jGegLJrf3ITStLwVf715O39dq5u48Kr/XW14U=", + "lastModified": 1694937365, + "narHash": "sha256-iHZSGrb9gVpZRR4B2ishUN/1LRKWtSHZNO37C8z1SmA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f3fbbc36b4e179a5985b9ab12624e9dfe7989341", + "rev": "5d017a8822e0907fb96f7700a319f9fe2434de02", "type": "github" }, "original": { @@ -446,11 +446,11 @@ ] }, "locked": { - "lastModified": 1687440270, - "narHash": "sha256-aOAXvfVn+MBSkU+xlQEiyoGpRaF6NvQdpWIhw5OH/Dc=", + "lastModified": 1693539235, + "narHash": "sha256-ACmCq1+RnVq+EB7yeN6fThUR3cCJZb6lKEfv937WG84=", "owner": "berberman", "repo": "nvfetcher", - "rev": "44196458acc2c28c32e456c50277d6148e71e708", + "rev": "2bcf73dea96497ac9c36ed320b457caa705f9485", "type": "github" }, "original": { @@ -556,11 +556,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1690199016, - "narHash": "sha256-yTLL72q6aqGmzHq+C3rDp3rIjno7EJZkFLof6Ika7cE=", + "lastModified": 1694495315, + "narHash": "sha256-sZEYXs9T1NVHZSSbMqBEtEm2PGa7dEDcx0ttQkArORc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c36df4fe4bf4bb87759b1891cab21e7a05219500", + "rev": "ea208e55f8742fdcc0986b256bdfa8986f5e4415", "type": "github" }, "original": { From 355ae4b70bd32bae21ce199c3253c2b51e04be9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= Date: Mon, 18 Sep 2023 04:17:07 +0200 Subject: [PATCH 2/3] nextcloud: Update apps --- pkgs/_sources_nextcloud/generated.json | 24 ++++++++++++------------ pkgs/_sources_nextcloud/generated.nix | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/_sources_nextcloud/generated.json b/pkgs/_sources_nextcloud/generated.json index e8bf16d..1e731e8 100644 --- a/pkgs/_sources_nextcloud/generated.json +++ b/pkgs/_sources_nextcloud/generated.json @@ -7,11 +7,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-aflxesvTOdNjPtHRtSPtImdmh4JmzM4s8iF5+lYYo3c=", + "sha256": "sha256-7baI+vGBg48vZKZY0ikme+4PQl+PLUlC6JE0Air2s5E=", "type": "tarball", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.0.1/bookmarks-13.0.1.tar.gz" + "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz" }, - "version": "13.0.1" + "version": "13.1.1" }, "calendar": { "cargoLocks": null, @@ -21,11 +21,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-OAsM65aBJUA8toRSr3/UsdSTq/Rgn43s4nOabqoEoAI=", + "sha256": "sha256-8KwFmnFFlyYzKy2acCCjmpRj2W5pOrbQaPRPm16ZZ7g=", "type": "tarball", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.3/calendar-v4.4.3.tar.gz" + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.0/calendar-v4.5.0.tar.gz" }, - "version": "v4.4.3" + "version": "v4.5.0" }, "contacts": { "cargoLocks": null, @@ -35,11 +35,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-aG2wD4ioDYXwbyzZBpsEzz0PNvuF95V0JdJNw+kbMzk=", + "sha256": "sha256-dNim0PqUlEGB6J/OTsOjyUZ2JhOBhXC60HhjTstmF4s=", "type": "tarball", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.2/contacts-v5.3.2.tar.gz" + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.0/contacts-v5.4.0.tar.gz" }, - "version": "v5.3.2" + "version": "v5.4.0" }, "cookbook": { "cargoLocks": null, @@ -63,11 +63,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-hhXPEITSbCiFs0o+TOsQnSasXBpjU9mA/OFsbzuaCPw=", + "sha256": "sha256-WrLikMN8jxu+vav9Xn8J1wUoGN5wQeQGr5pbVT6GLck=", "type": "tarball", - "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz" + "url": "https://github.com/nextcloud/news/releases/download/23.0.0/news.tar.gz" }, - "version": "22.0.0" + "version": "23.0.0" }, "notes": { "cargoLocks": null, diff --git a/pkgs/_sources_nextcloud/generated.nix b/pkgs/_sources_nextcloud/generated.nix index bab2e14..ecdbdf3 100644 --- a/pkgs/_sources_nextcloud/generated.nix +++ b/pkgs/_sources_nextcloud/generated.nix @@ -3,26 +3,26 @@ { bookmarks = { pname = "bookmarks"; - version = "13.0.1"; + version = "13.1.1"; src = fetchTarball { - url = "https://github.com/nextcloud/bookmarks/releases/download/v13.0.1/bookmarks-13.0.1.tar.gz"; - sha256 = "sha256-aflxesvTOdNjPtHRtSPtImdmh4JmzM4s8iF5+lYYo3c="; + url = "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz"; + sha256 = "sha256-7baI+vGBg48vZKZY0ikme+4PQl+PLUlC6JE0Air2s5E="; }; }; calendar = { pname = "calendar"; - version = "v4.4.3"; + version = "v4.5.0"; src = fetchTarball { - url = "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.3/calendar-v4.4.3.tar.gz"; - sha256 = "sha256-OAsM65aBJUA8toRSr3/UsdSTq/Rgn43s4nOabqoEoAI="; + url = "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.0/calendar-v4.5.0.tar.gz"; + sha256 = "sha256-8KwFmnFFlyYzKy2acCCjmpRj2W5pOrbQaPRPm16ZZ7g="; }; }; contacts = { pname = "contacts"; - version = "v5.3.2"; + version = "v5.4.0"; src = fetchTarball { - url = "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.2/contacts-v5.3.2.tar.gz"; - sha256 = "sha256-aG2wD4ioDYXwbyzZBpsEzz0PNvuF95V0JdJNw+kbMzk="; + url = "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.0/contacts-v5.4.0.tar.gz"; + sha256 = "sha256-dNim0PqUlEGB6J/OTsOjyUZ2JhOBhXC60HhjTstmF4s="; }; }; cookbook = { @@ -35,10 +35,10 @@ }; news = { pname = "news"; - version = "22.0.0"; + version = "23.0.0"; src = fetchTarball { - url = "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz"; - sha256 = "sha256-hhXPEITSbCiFs0o+TOsQnSasXBpjU9mA/OFsbzuaCPw="; + url = "https://github.com/nextcloud/news/releases/download/23.0.0/news.tar.gz"; + sha256 = "sha256-WrLikMN8jxu+vav9Xn8J1wUoGN5wQeQGr5pbVT6GLck="; }; }; notes = { From ab5e088016d6576cfb01a9b4d6a842995728a5d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= Date: Mon, 18 Sep 2023 04:17:16 +0200 Subject: [PATCH 3/3] conduit: Add Element X support --- configuration/services/conduit.nix | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/configuration/services/conduit.nix b/configuration/services/conduit.nix index 871b5e2..2d341b7 100644 --- a/configuration/services/conduit.nix +++ b/configuration/services/conduit.nix @@ -207,12 +207,28 @@ in { merge_slashes off; ''; - locations."/_matrix" = { - proxyPass = "http://${cfg.settings.global.address}:${toString cfg.settings.global.port}"; - # Recommended by conduit - extraConfig = '' - proxy_buffering off; - ''; + locations = { + "/_matrix" = { + proxyPass = "http://${cfg.settings.global.address}:${toString cfg.settings.global.port}"; + # Recommended by conduit + extraConfig = '' + proxy_buffering off; + ''; + }; + + # Add Element X support + # TODO(tlater): Remove when no longer required: https://github.com/vector-im/element-x-android/issues/1085 + "=/.well-known/matrix/client" = { + alias = pkgs.writeText "well-known-matrix-client" (builtins.toJSON { + "m.homeserver".base_url = "https://${domain}"; + "org.matrix.msc3575.proxy".url = "https://${domain}"; + }); + + extraConfig = '' + default_type application/json; + add_header Access-Control-Allow-Origin "*"; + ''; + }; }; }; }