Merge pull request 'update' (#309) from update-flake into main

Reviewed-on: #309

akkoma/0001-make-previews-not-break-on-apps-like-telegram.patch

@@ -0,0 +1,195 @@
+From 192348a73e57f556a96f5c2bc2c15fa680ee526a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
+Date: Thu, 31 Aug 2023 14:35:17 +0100
+Subject: [PATCH] make previews not break on apps like telegram
+
+---
+ .../web/metadata/providers/twitter_card.ex    | 121 ++++++++++--------
+ 1 file changed, 71 insertions(+), 50 deletions(-)
+
+diff --git a/lib/pleroma/web/metadata/providers/twitter_card.ex b/lib/pleroma/web/metadata/providers/twitter_card.ex
+index ab48ea272..f99d953e1 100644
+--- a/lib/pleroma/web/metadata/providers/twitter_card.ex
++++ b/lib/pleroma/web/metadata/providers/twitter_card.ex
+@@ -16,18 +16,39 @@ defmodule Pleroma.Web.Metadata.Providers.TwitterCard do
+   @media_types ["image", "audio", "video"]
+ 
+   @impl Provider
+-  def build_tags(%{activity_id: id, object: object, user: user}) do
+-    attachments = build_attachments(id, object)
++  def build_tags(%{
++        object: object,
++        url: url,
++        user: user
++      }) do
++    attachments = build_attachments(object)
+     scrubbed_content = Utils.scrub_html_and_truncate(object)
+ 
+     [
+-      title_tag(user),
+-      {:meta, [name: "twitter:description", content: scrubbed_content], []}
++      {:meta,
++        [
++          property: "twitter:card",
++          content: "summary"
++        ], []},
++      {:meta,
++       [
++         property: "twitter:title",
++         content: Utils.user_name_string(user)
++       ], []},
++      {:meta, [property: "twitter:url", content: url], []},
++      {:meta,
++       [
++         property: "twitter:description",
++         content: scrubbed_content
++       ], []},
++      {:meta, [property: "twitter:type", content: "article"], []}
+     ] ++
+       if attachments == [] or Metadata.activity_nsfw?(object) do
+         [
+-          image_tag(user),
+-          {:meta, [name: "twitter:card", content: "summary"], []}
++          {:meta, [property: "twitter:image", content: MediaProxy.preview_url(User.avatar_url(user))],
++           []},
++          {:meta, [property: "twitter:image:width", content: 150], []},
++          {:meta, [property: "twitter:image:height", content: 150], []}
+         ]
+       else
+         attachments
+@@ -38,33 +59,32 @@ def build_tags(%{activity_id: id, object: object, user: user}) do
+   def build_tags(%{user: user}) do
+     with truncated_bio = Utils.scrub_html_and_truncate(user.bio) do
+       [
+-        title_tag(user),
+-        {:meta, [name: "twitter:description", content: truncated_bio], []},
+-        image_tag(user),
+-        {:meta, [name: "twitter:card", content: "summary"], []}
++        {:meta,
++         [
++           property: "twitter:title",
++           content: Utils.user_name_string(user)
++         ], []},
++        {:meta, [property: "twitter:url", content: user.uri || user.ap_id], []},
++        {:meta, [property: "twitter:description", content: truncated_bio], []},
++        {:meta, [property: "twitter:type", content: "article"], []},
++        {:meta, [property: "twitter:image", content: MediaProxy.preview_url(User.avatar_url(user))],
++         []},
++        {:meta, [property: "twitter:image:width", content: 150], []},
++        {:meta, [property: "twitter:image:height", content: 150], []}
+       ]
+     end
+   end
+ 
+-  defp title_tag(user) do
+-    {:meta, [name: "twitter:title", content: Utils.user_name_string(user)], []}
+-  end
+-
+-  def image_tag(user) do
+-    {:meta, [name: "twitter:image", content: MediaProxy.preview_url(User.avatar_url(user))], []}
+-  end
+-
+-  defp build_attachments(id, %{data: %{"attachment" => attachments}}) do
++  defp build_attachments(%{data: %{"attachment" => attachments}}) do
+     Enum.reduce(attachments, [], fn attachment, acc ->
+       rendered_tags =
+         Enum.reduce(attachment["url"], [], fn url, acc ->
++          # TODO: Whatsapp only wants JPEG or PNGs. It seems that if we add a second twitter:image
++          # object when a Video or GIF is attached it will display that in Whatsapp Rich Preview.
+           case Utils.fetch_media_type(@media_types, url["mediaType"]) do
+             "audio" ->
+               [
+-                {:meta, [name: "twitter:card", content: "player"], []},
+-                {:meta, [name: "twitter:player:width", content: "480"], []},
+-                {:meta, [name: "twitter:player:height", content: "80"], []},
+-                {:meta, [name: "twitter:player", content: player_url(id)], []}
++                {:meta, [property: "twitter:audio", content: MediaProxy.url(url["href"])], []}
+                 | acc
+               ]
+ 
+@@ -75,32 +95,19 @@ defp build_attachments(id, %{data: %{"attachment" => attachments}}) do
+             # workaround.
+             "image" ->
+               [
+-                {:meta, [name: "twitter:card", content: "summary_large_image"], []},
+-                {:meta,
+-                 [
+-                   name: "twitter:player",
+-                   content: MediaProxy.url(url["href"])
+-                 ], []}
++                {:meta, [property: "twitter:image", content: MediaProxy.url(url["href"])], []},
++                {:meta, [property: "twitter:image:alt", content: attachment["name"]], []}
+                 | acc
+               ]
+               |> maybe_add_dimensions(url)
+ 
+             "video" ->
+-              # fallback to old placeholder values
+-              height = url["height"] || 480
+-              width = url["width"] || 480
+-
+               [
+-                {:meta, [name: "twitter:card", content: "player"], []},
+-                {:meta, [name: "twitter:player", content: player_url(id)], []},
+-                {:meta, [name: "twitter:player:width", content: "#{width}"], []},
+-                {:meta, [name: "twitter:player:height", content: "#{height}"], []},
+-                {:meta, [name: "twitter:player:stream", content: MediaProxy.url(url["href"])],
+-                 []},
+-                {:meta, [name: "twitter:player:stream:content_type", content: url["mediaType"]],
+-                 []}
++                {:meta, [property: "twitter:video", content: MediaProxy.url(url["href"])], []}
+                 | acc
+               ]
++              |> maybe_add_dimensions(url)
++              |> maybe_add_video_thumbnail(url)
+ 
+             _ ->
+               acc
+@@ -111,21 +118,35 @@ defp build_attachments(id, %{data: %{"attachment" => attachments}}) do
+     end)
+   end
+ 
+-  defp build_attachments(_id, _object), do: []
++  defp build_attachments(_), do: []
+ 
+-  defp player_url(id) do
+-    url(~p[/notice/#{id}/embed_player])
+-  end
+-
+-  # Videos have problems without dimensions, but we used to not provide WxH for images.
+-  # A default (read: incorrect) fallback for images is likely to cause rendering bugs.
++  # We can use url["mediaType"] to dynamically fill the metadata
+   defp maybe_add_dimensions(metadata, url) do
++    type = url["mediaType"] |> String.split("/") |> List.first()
++
+     cond do
+       !is_nil(url["height"]) && !is_nil(url["width"]) ->
+         metadata ++
+           [
+-            {:meta, [name: "twitter:player:width", content: "#{url["width"]}"], []},
+-            {:meta, [name: "twitter:player:height", content: "#{url["height"]}"], []}
++            {:meta, [property: "twitter:#{type}:width", content: "#{url["width"]}"], []},
++            {:meta, [property: "twitter:#{type}:height", content: "#{url["height"]}"], []}
++          ]
++
++      true ->
++        metadata
++    end
++  end
++
++  # Media Preview Proxy makes thumbnails of videos without resizing, so we can trust the
++  # width and height of the source video.
++  defp maybe_add_video_thumbnail(metadata, url) do
++    cond do
++      Pleroma.Config.get([:media_preview_proxy, :enabled], false) ->
++        metadata ++
++          [
++            {:meta, [property: "twitter:image:width", content: "#{url["width"]}"], []},
++            {:meta, [property: "twitter:image:height", content: "#{url["height"]}"], []},
++            {:meta, [property: "twitter:image", content: MediaProxy.preview_url(url["href"])], []}
+           ]
+ 
+       true ->
+-- 
+2.41.0
+

akkoma/default.nix

@@ -26,6 +26,7 @@
       ./require-image-description.patch
       ./make-uploads-private.patch
       ./0001-Revert-Config-Restrict-permissions-of-OTP-config-fil.patch
+      ./0001-make-previews-not-break-on-apps-like-telegram.patch
     ];
   };
   mkOverride = final: prev: name:

akkoma/source.json

@@ -1,10 +1,10 @@
 {
   "url": "https://akkoma.dev/AkkomaGang/akkoma.git",
-  "rev": "5c164028cf7e45811ddcf8b9cfd3dcab56717827",
-  "date": "2023-08-16T23:11:36+01:00",
-  "path": "/nix/store/av1jp62wsv30vc0wyrybv4f4fdsvxjgi-akkoma",
-  "sha256": "0472v1qpax12lb8gisqkvv77spbhwxlv5vs6kvp1qagnnlh795d4",
-  "hash": "sha256-pJV0ILX2KRzunkbvsmnncF19zt4T6/jQoiJ0dXHY4hA=",
+  "rev": "c8e08e9cc35c4e856994e8577913e848e42153ad",
+  "date": "2023-08-25T11:00:49+01:00",
+  "path": "/nix/store/kczygbwq46v5i31xrhx7hy7hbz9mw80c-akkoma",
+  "sha256": "180v7xn3f6z98m3yjm1yc6kraf88kl4mmj4aygq2mfiwbmckc5vn",
+  "hash": "sha256-dhc2WV08uirw84rIWgmdCDmVp2E+VOlHRekbN2w/G6A=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

flake.lock

@@ -171,11 +171,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1692691946,
-        "narHash": "sha256-cZ1BsPTFjja4xTTETfYRyoEvN+v5rn1ObpZWxCZ7N1o=",
+        "lastModified": 1693467772,
+        "narHash": "sha256-Yp6BP3LMhr0kqLjbyI1a//55VM3oQEx17L6RUXoi/AY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "edd0170251e9ed23db648e109a0b245e5d53b45d",
+        "rev": "3b54fab8d9992b5a8d1e86dea32a052427918de4",
         "type": "github"
       },
       "original": {

fonts/nasin-nanpa/source.json

@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/ETBCOR/nasin-nanpa",
-  "rev": "a87432a137e2e5e89d09c2a571ad0391221b6375",
-  "date": "2023-05-16T17:48:51-07:00",
-  "path": "/nix/store/m2gzmhr0lm3wjyjhagm8kf2li6drydwv-nasin-nanpa",
-  "sha256": "1fflz5708l2sv4fq8k7z556kbqf0x1qh6scjckm0ws9g9w4y8ppj",
-  "hash": "sha256-8l7kCU8vaQ7qZJJpA3HowOE1TSn/TIQd2VpQBE751Lk=",
+  "rev": "1e9fd5533b28c475ac1d387db298ff1cfc7f5804",
+  "date": "2023-08-25T13:20:05-07:00",
+  "path": "/nix/store/fhrgy9wmwn3z7gscpwk6j29a01lzspnp-nasin-nanpa",
+  "sha256": "17gjg9bwv95bvkmcdvgxqnf4wk3irzmirny7r1bm5h53wqivv4pw",
+  "hash": "sha256-/JK9I+ajwFJXyMfbHOvPcUxOnMX97cbq3KukzVd68p0=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

fonts/nasin-nanpa/version.json

@@ -1 +1 @@
-{"major": "2.6", "minor": "2.6.11"}
+{"major": "2.7", "minor": "2.7.01"}

matrix/element-web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.38",
+    "version": "1.11.39",
     "description": "A feature-rich client for Matrix.org",
     "author": "New Vector Ltd.",
     "repository": {
@@ -36,7 +36,7 @@
         "clean": "rimraf lib webapp",
         "build": "yarn clean && yarn build:genfiles && yarn build:bundle",
         "build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats",
-        "build:jitsi": "node scripts/build-jitsi.js",
+        "build:jitsi": "ts-node scripts/build-jitsi.ts",
         "build:res": "node scripts/copy-res.js",
         "build:genfiles": "yarn build:res && yarn build:jitsi && yarn build:module_system",
         "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
@@ -61,7 +61,7 @@
         "lint:style": "stylelint \"res/css/**/*.pcss\"",
         "test": "jest",
         "coverage": "yarn test --coverage",
-        "analyse:unused-exports": "node ./scripts/analyse_unused_exports.js",
+        "analyse:unused-exports": "ts-node ./scripts/analyse_unused_exports.ts",
         "analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp"
     },
     "resolutions": {
@@ -70,7 +70,7 @@
     },
     "dependencies": {
         "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz",
-        "@matrix-org/react-sdk-module-api": "^1.0.0",
+        "@matrix-org/react-sdk-module-api": "^2.0.0",
         "gfm.css": "^1.1.2",
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
@@ -109,6 +109,7 @@
         "@types/jsrsasign": "^10.5.4",
         "@types/modernizr": "^3.5.3",
         "@types/node": "^16",
+        "@types/node-fetch": "^2.6.4",
         "@types/react": "17.0.58",
         "@types/react-dom": "17.0.19",
         "@types/ua-parser-js": "^0.7.36",
@@ -145,7 +146,7 @@
         "json-loader": "^0.5.7",
         "loader-utils": "^3.0.0",
         "matrix-mock-request": "^2.5.0",
-        "matrix-web-i18n": "^1.4.0",
+        "matrix-web-i18n": "^2.0.0",
         "mini-css-extract-plugin": "^1",
         "minimist": "^1.2.6",
         "mkdirp": "^3.0.0",
@@ -163,10 +164,10 @@
         "postcss-scss": "^4.0.4",
         "postcss-simple-vars": "^5.0.2",
         "prettier": "2.8.8",
+        "proxy-agent": "^6.3.0",
         "raw-loader": "^4.0.2",
         "rimraf": "^5.0.0",
         "semver": "^7.5.2",
-        "simple-proxy-agent": "^1.1.0",
         "string-replace-loader": "3",
         "style-loader": "2",
         "stylelint": "^15.10.1",

matrix/element-web/source.json

@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/maunium/element-web",
-  "rev": "f1850c068299696f266e4fd11a5316d2e557923d",
-  "date": "2023-08-09T22:22:26+03:00",
-  "path": "/nix/store/vpsv8w60n13ir3k85vwl06x4afb9n59l-element-web",
-  "sha256": "0lsjh8n7lb27aaqqzah92lfyp6b117rgb6fajyy9lfx02k7vm8hq",
-  "hash": "sha256-GKK6zxSgO5q8l8qZ9fIJYZnrHRUJqo+xUkcseiyCUlM=",
+  "rev": "0499e9964cca19b88a4a59cff7fb82ffd9d406c6",
+  "date": "2023-08-22T14:18:13+03:00",
+  "path": "/nix/store/lvcm1b7237rdm7i30vj7jq4hhvx6yspi-element-web",
+  "sha256": "02n8qpcapb6r2l5cn5xni471m1bpbb5wcl1h2vk7np9q2x7lnv6x",
+  "hash": "sha256-3WxLTxc4XXvmFjBQxstad4UaDom2F8sKFdmsq9jFyAo=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

matrix/mautrix-discord/gomod2nix.toml

@@ -60,8 +60,8 @@ schema = 3
     version = "v1.2.5"
     hash = "sha256-OYGNolkmL7E1Qs2qrQ3IVpQp5gkcHNU/AB/z2O+Myps="
   [mod."github.com/yuin/goldmark"]
-    version = "v1.5.5"
-    hash = "sha256-6tpOQPaIXf7WWjbOVd5D4XXtbXSfGIYbzdIrDnlELrQ="
+    version = "v1.5.6"
+    hash = "sha256-+yAEKuRtXHX2THh3XMSG6UPcPPU0sSz5H5taH9Mx1Jc="
   [mod."go.mau.fi/util"]
     version = "v0.0.0-20230805171708-199bf3eec776"
     hash = "sha256-9ZGlBZl3zSBI/Hbc9N6I3RZhcf0YZ6SvvGRI3Im4t0U="
@@ -72,8 +72,8 @@ schema = 3
     version = "v0.12.0"
     hash = "sha256-Wes72EA9ICTG8o0nEYWZk9xjpqlniorFeY6o26GExns="
   [mod."golang.org/x/exp"]
-    version = "v0.0.0-20230811145659-89c5cff77bcb"
-    hash = "sha256-z/WuemZcUyYQIyGOOmdgVlg+3TPXA+TZmiVMH3xdJL0="
+    version = "v0.0.0-20230817173708-d852ddb80c63"
+    hash = "sha256-mXqobW94++1Ei5cFMyb9rVkA+lyc7kqj0tz7JOFIF4w="
   [mod."golang.org/x/net"]
     version = "v0.14.0"
     hash = "sha256-QScKgO7lBWOsd0Y31wLRzFETv3tjqdB/eRQWW5q7aV4="
@@ -96,5 +96,5 @@ schema = 3
     version = "v2.4.1"
     hash = "sha256-OstOCC7Bib6mbcUG2X3YafEBikFhPQ8lN6jPK5c/Ah8="
   [mod."maunium.net/go/mautrix"]
-    version = "v0.16.0"
-    hash = "sha256-WhVILww1rjuhS9DgmrpYKUi+iynAj6MtgyRK6q1cVcY="
+    version = "v0.16.1-0.20230821105106-ac5c2c22102c"
+    hash = "sha256-eXNaXyE+Ow/SVrBqUxOo1wZbZ5cPmRfJ1MfWHKRVzJ8="

matrix/mautrix-discord/source.json

@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/mautrix/discord",
-  "rev": "345391f8b1f28e6fc69c4b414805f8146684fa6a",
-  "date": "2023-08-17T20:46:18+03:00",
-  "path": "/nix/store/kvmllhidx2ig0xn4z3jy2rsdx1k5l4xz-discord",
-  "sha256": "0p0cpvf1npnxrm9pwvjgpi477r5rhznii98zncnqranckynls26f",
-  "hash": "sha256-zghNrZ/Mqowtsx+lGO2HueRzSLxPbn5Tzd1eG9y+DFw=",
+  "rev": "c710ea18aa001388f989113906cd29096a81f3d7",
+  "date": "2023-08-29T11:43:36+03:00",
+  "path": "/nix/store/3lkzydzyq8l4nwdgd5vvx3w00sg6j8v3-discord",
+  "sha256": "0lfjq21y3jq54pw4l0j6pp5z5yy79yipkixjrlwm6hcvlvnzz2wn",
+  "hash": "sha256-lov/7aabQVM5zbLHeaNPx/vyy71GAkr4JQXL4YPA0lE=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

matrix/mautrix-telegram/source.json

@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/mautrix/telegram",
-  "rev": "768d51c4ae8c245d4a55045d2ff41d362d151137",
-  "date": "2023-08-19T12:09:22+03:00",
-  "path": "/nix/store/7gvgs5asb0996fib79cj3jia2pnbs4n3-telegram",
-  "sha256": "0xl85lnl1hvsivvh81f1www8n0p97bc4431yv4z6bbkvlhxyvzb5",
-  "hash": "sha256-Zf3tO6R7rmU+2T4MQtg66QKLOOfBBQT3jnrDQC0tiHY=",
+  "rev": "215f077cf01839067af1a9dea207be94927fff46",
+  "date": "2023-08-29T21:10:37+03:00",
+  "path": "/nix/store/78cbhv0l88x86dm9v2s6ql9arrd1bkn6-telegram",
+  "sha256": "17y0l3q0qf28lhqyzj3g3mp95x0a3ici8nzd1zriy9xdccg75zzk",
+  "hash": "sha256-8/9yHmOtJx/zD+1bFFkcCvSSbh1vyO8xpEg4DPCgwJ8=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

matrix/mautrix-whatsapp/gomod2nix.toml

@@ -86,8 +86,8 @@ schema = 3
     version = "v0.0.0-20230805171708-199bf3eec776"
     hash = "sha256-9ZGlBZl3zSBI/Hbc9N6I3RZhcf0YZ6SvvGRI3Im4t0U="
   [mod."go.mau.fi/whatsmeow"]
-    version = "v0.0.0-20230821092221-636dac24aed9"
-    hash = "sha256-DzEoDvpZmWHy9kPr4wYmKLYePcwufGmtEW7bEPajbHE="
+    version = "v0.0.0-20230824151650-6da2abde6b7c"
+    hash = "sha256-N4fVb3K/SnMNB9bEHUl6wbbHNFuPEjP0pFLk6Iaud2k="
   [mod."go.mau.fi/zeroconfig"]
     version = "v0.1.2"
     hash = "sha256-xf4p2Z5Pl9In3ne9BVmy7YvtooSRBzqxP4Pl2jdVN8w="

matrix/mautrix-whatsapp/source.json

@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/mautrix/whatsapp",
-  "rev": "bd01c661ef45c7f78c124a22c4e7d734256156dc",
-  "date": "2023-08-21T13:52:12+03:00",
-  "path": "/nix/store/a1kdgkzdykgrhd5s4cxd17vzc77xpr6h-whatsapp",
-  "sha256": "0rb4mpyvq0hrn83bapc1phsly870yknh711sx5q6q2zszh9wrk6w",
-  "hash": "sha256-3MzME/z6C2xw6TqEA+304CBPNbyBXbUGshkCvP2tZGU=",
+  "rev": "e3a93680b2de6abe886f72890373c59bbc5d6975",
+  "date": "2023-08-28T14:52:14+03:00",
+  "path": "/nix/store/lz9dav93rjwy8mi5cpdf2wsl229qb916-whatsapp",
+  "sha256": "0xpw775lr6m5rrq8gqmyncyvawrjq4gxs2jrlxan0jcyy0djml07",
+  "hash": "sha256-B9AqG/CeSWBVp1kK3R/BMnO1PbO+4odwzqWaTMs5/HY=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

matrix/sliding-sync/gomod2nix.toml

@@ -7,9 +7,12 @@ schema = 3
   [mod."github.com/beorn7/perks"]
     version = "v1.0.1"
     hash = "sha256-h75GUqfwJKngCJQVE5Ao5wnO3cfKD9lSIteoLp/3xJ4="
+  [mod."github.com/cenkalti/backoff/v4"]
+    version = "v4.2.1"
+    hash = "sha256-CKogmPe0pCcAdpztzPwr24rLTJZfq8QVZ9AUduwAcoA="
   [mod."github.com/cespare/xxhash/v2"]
-    version = "v2.1.2"
-    hash = "sha256-YV9SmXDtmmgQylQUfrUgQLAPfqYexcHxegMBT+IX9qM="
+    version = "v2.2.0"
+    hash = "sha256-nPufwYQfTkyrEkbBrpqM3C2vnMxfIz6tAaBmiUP7vd4="
   [mod."github.com/felixge/httpsnoop"]
     version = "v1.0.3"
     hash = "sha256-qV3UPYKKBQDTzAUzzsTpfdbGhFnkmTO/r5ylPL1SyfA="
@@ -29,11 +32,14 @@ schema = 3
     version = "v1.2.3"
     hash = "sha256-8iBqqOlzJiTYElReCbB+2CZXn8szxH58yazHwontsJU="
   [mod."github.com/golang/protobuf"]
-    version = "v1.5.2"
-    hash = "sha256-IVwooaIo46iq7euSSVWTBAdKd+2DUaJ67MtBao1DpBI="
+    version = "v1.5.3"
+    hash = "sha256-svogITcP4orUIsJFjMtp+Uv1+fKJv2Q5Zwf2dMqnpOQ="
   [mod."github.com/gorilla/mux"]
     version = "v1.8.0"
     hash = "sha256-s905hpzMH9bOLue09E2JmzPXfIS4HhAlgT7g13HCwKE="
+  [mod."github.com/grpc-ecosystem/grpc-gateway/v2"]
+    version = "v2.17.0"
+    hash = "sha256-EZTOzai8AoC4pTh3V4KcLbsGR+1b6U0WltkrZZA0YKg="
   [mod."github.com/jmoiron/sqlx"]
     version = "v1.3.3"
     hash = "sha256-bhpbvoyhgRME1EMQFBWR0vl/wWfuk4ZuKmELH9Sox/M="
@@ -106,6 +112,15 @@ schema = 3
   [mod."go.opentelemetry.io/otel/exporters/jaeger"]
     version = "v1.16.0"
     hash = "sha256-l0R7iGb8jc6gWZOdwZS/i4zdvbstyUrERIEhQ6RIM48="
+  [mod."go.opentelemetry.io/otel/exporters/otlp/internal/retry"]
+    version = "v1.16.0"
+    hash = "sha256-gy5ay8amiShRZhfemxxYKekzof0OSK5tRrKjFkTnwHs="
+  [mod."go.opentelemetry.io/otel/exporters/otlp/otlptrace"]
+    version = "v1.16.0"
+    hash = "sha256-nYF/Nv7EJruQaXbDsbLOzHVk/ji/NUaE8gMB3TZAP+c="
+  [mod."go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"]
+    version = "v1.16.0"
+    hash = "sha256-IVDvM0YqxzrKaRyB393ohVrzcnF1lK6JBbnVQ0AwOWA="
   [mod."go.opentelemetry.io/otel/metric"]
     version = "v1.16.0"
     hash = "sha256-wl64wdxrQlHnXOK8HpPoH4xUE59DJ4nrAO2/yuzmgD0="
@@ -115,18 +130,33 @@ schema = 3
   [mod."go.opentelemetry.io/otel/trace"]
     version = "v1.16.0"
     hash = "sha256-14YQtLnMYjjt1AlAg1CTQmQflZ+IAp48kqQghZKDXn8="
+  [mod."go.opentelemetry.io/proto/otlp"]
+    version = "v1.0.0"
+    hash = "sha256-w2WbhXXshdm/ZmZkg5VpWwXFLjJRBBwSObyHGjJcELQ="
   [mod."golang.org/x/crypto"]
-    version = "v0.10.0"
-    hash = "sha256-K+hdDHZM4oguyeYQAlp8Pu+BdVmo1pSIQ6jdVHdVPW0="
+    version = "v0.12.0"
+    hash = "sha256-Wes72EA9ICTG8o0nEYWZk9xjpqlniorFeY6o26GExns="
+  [mod."golang.org/x/net"]
+    version = "v0.14.0"
+    hash = "sha256-QScKgO7lBWOsd0Y31wLRzFETv3tjqdB/eRQWW5q7aV4="
   [mod."golang.org/x/sync"]
     version = "v0.2.0"
     hash = "sha256-hKk9zsy2aXY7R0qGFZhGOVvk5qD17f6KHEuK4rGpTsg="
   [mod."golang.org/x/sys"]
-    version = "v0.10.0"
-    hash = "sha256-eeifyHj8IcTAruekJAGMCcjFyU2GAIAgvxS36hPZM1U="
-  [mod."golang.org/x/text"]
     version = "v0.11.0"
-    hash = "sha256-W/XvTPAGIOlFVwZ7rTaEid7pdRtb4wc6a+nyOW99/ks="
+    hash = "sha256-g/LjhABK2c/u6v7M2aAIrHvZjmx/ikGHkef86775N38="
+  [mod."golang.org/x/text"]
+    version = "v0.12.0"
+    hash = "sha256-aNQaW3EgCK9ehpnBzIAkZX6TmiUU1S175YlJUH7P5Qg="
+  [mod."google.golang.org/genproto/googleapis/api"]
+    version = "v0.0.0-20230822172742-b8732ec3820d"
+    hash = "sha256-qd9dJezVHNJZNMkywXapT1rsyD+lb25AU8aG8NJlhm4="
+  [mod."google.golang.org/genproto/googleapis/rpc"]
+    version = "v0.0.0-20230822172742-b8732ec3820d"
+    hash = "sha256-1kP7lqQ+fKtARDzTrRNob0owX4GsUnxzOwLyBZSmHOc="
+  [mod."google.golang.org/grpc"]
+    version = "v1.57.0"
+    hash = "sha256-hP6alxFu+pcLI4gT3idzEMYNp+DbU3P4xhkpIqGCPXg="
   [mod."google.golang.org/protobuf"]
-    version = "v1.29.1"
-    hash = "sha256-ilSVvttGSP2xpqpoyQ0/Iuyx1WMiwe6GASKTfoeaqxw="
+    version = "v1.31.0"
+    hash = "sha256-UdIk+xRaMfdhVICvKRk1THe3R1VU+lWD8hqoW/y8jT0="

matrix/sliding-sync/source.json

@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/matrix-org/sliding-sync",
-  "rev": "c610d2bba46278d17f8c5274377c845be83a0989",
-  "date": "2023-08-21T17:53:10+01:00",
-  "path": "/nix/store/75rww95apbgdk8wydhzdb19ily4535vg-sliding-sync",
-  "sha256": "0s73fg3kbamf69bjdwfnrkfd733k6y68mfck1a7irdc6l80hsb4q",
-  "hash": "sha256-mCwNAaKGtRyPCpO5iow3c4zT3MzW8SZXMq6qNcdz42g=",
+  "rev": "195c52f937a96c1d5200ff63a515bf3fa7b24aa2",
+  "date": "2023-08-29T11:12:10+01:00",
+  "path": "/nix/store/33v6q1mldgajbb540nkan4maz1hmg1g5-sliding-sync",
+  "sha256": "139symxal9phvv7j82rsfnm1blviha7w8x02w8wwiw1xrv7jk85w",
+  "hash": "sha256-vKApz8498Mg54gJ0xI+CcdMVqnU6CyTP3vAmqnr1Oo0=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

minecraft/papermc/paper.json

@@ -1,6 +1,6 @@
 {
   "version": "1.20.1",
-  "build": 155,
-  "name": "paper-1.20.1-155.jar",
-  "sha256": "6e4a1d36f235fad272890d9ed7b2d6ea7f87b9526f629abb53385cd23a45af44"
+  "build": 169,
+  "name": "paper-1.20.1-169.jar",
+  "sha256": "86f7f5e03b43991c1897028107f2face052b0ccbdd14b577a1e21277af7cbd11"
 }

plover/plover-machine-hid.json

@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/dnaq/plover-machine-hid",
-  "rev": "3112cabd180b512d6c85a5dda259e9be9996ce32",
-  "date": "2022-12-28T16:27:53+01:00",
-  "path": "/nix/store/m8rzky40wb4cmlpjj7hlrkycp22fk7lz-plover-machine-hid",
-  "sha256": "1894jhazyznql30rgmgasx526f7khh8kckgpcj52y5kfq8vaqbq1",
-  "hash": "sha256-AS+sNsJuFi+KZPdNNhGE8zgjStfq1ZfBoNh+/xWUJKE=",
+  "rev": "4924dfc1ddf542182cb5de6075a659f75f88b124",
+  "date": "2023-08-27T18:33:12+02:00",
+  "path": "/nix/store/6hr6fzmjg5cy49hfsdfshyjq3hrw0jp5-plover-machine-hid",
+  "sha256": "1s28bxzakqii42bbddij2hrdxmnzkg62hnk2s0i7v3aj8hn0zi6q",
+  "hash": "sha256-2MQPLERSjX0i0GJaKMyb39beMhQytraWIDHiqX5fSOg=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

python/mautrix.nix

@@ -12,11 +12,11 @@
 }:
 buildPythonPackage rec {
   pname = "mautrix";
-  version = "0.20.0";
+  version = "0.20.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-z+fEu4UJmONsVov1E37b9w0+cYh1FBMZRqooP8mXhvM=";
+    sha256 = "sha256-+/pcJFTKj56mJBqlQDjC9ltz8Ov1cAixxS5jRRauMFY=";
   };
 
   propagatedBuildInputs = [

python/tulir-telethon.nix

@@ -9,11 +9,11 @@
 }:
 buildPythonPackage rec {
   pname = "tulir-telethon";
-  version = "1.30.0a1";
+  version = "1.30.0a2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-WorG7i00MgnGtIVaLOb2Eo9bHdTje07K/lfexnqX5LU=";
+    sha256 = "sha256-PkdxOdl1HM9SEC/CMOetahDzVJDg+zPP7s9NCsVdQsA=";
   };
 
   patchPhase = ''

scripts/update-go.sh

@@ -1,5 +1,4 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p go
+#!/usr/bin/env bash
 SOURCE=$1
 WRITE_PATH=$(realpath $2)