From 2c2500338fc6a8c69622b50f521c34e0b9e11b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Wed, 4 Jan 2023 12:47:02 +0100 Subject: [PATCH] manual update --- akkoma/jxl-polyfill.patch | 15 +++++---------- akkoma/mix.nix | 13 +++++++++++++ akkoma/pleroma-fe/package.json | 3 ++- akkoma/pleroma-fe/source.json | 8 ++++---- akkoma/pleroma-fe/yarn.lock | 19 ++++++++++++------- akkoma/pleroma-fe/yarn.nix | 24 ++++++++++++++++-------- akkoma/source.json | 8 ++++---- flake.lock | 6 +++--- matrix/mautrix-signal/source.json | 8 ++++---- matrix/mautrix-telegram/source.json | 8 ++++---- matrix/mautrix-whatsapp/source.json | 8 ++++---- matrix/mautrix-whatsapp/vendor.sha256 | 2 +- plover/plover-rkb1-hid.json | 8 ++++---- python/tulir-telethon.nix | 4 ++-- 14 files changed, 78 insertions(+), 56 deletions(-) diff --git a/akkoma/jxl-polyfill.patch b/akkoma/jxl-polyfill.patch index 5931632..b8e11dd 100644 --- a/akkoma/jxl-polyfill.patch +++ b/akkoma/jxl-polyfill.patch @@ -1,17 +1,12 @@ diff --git a/lib/pleroma/web/plugs/http_security_plug.ex b/lib/pleroma/web/plugs/http_security_plug.ex -index 5f0b775be..fd032d071 100644 +index b1f1ada94..8bae50900 100644 --- a/lib/pleroma/web/plugs/http_security_plug.ex +++ b/lib/pleroma/web/plugs/http_security_plug.ex -@@ -114,12 +114,7 @@ defp csp_string(conn) do - style_src = "style-src 'self' 'unsafe-inline'" - font_src = "font-src 'self' data:" +@@ -114,7 +114,7 @@ defp csp_string(conn) do + style_src = "style-src 'self' '#{nonce_tag}'" + font_src = "font-src 'self'" -- script_src = -- if Config.get(:env) == :dev do -- "script-src 'self' 'unsafe-eval' '#{nonce_tag}'" -- else -- "script-src 'self' '#{nonce_tag}'" -- end +- script_src = "script-src 'self' '#{nonce_tag}'" + script_src = "script-src 'self' 'unsafe-eval' '#{nonce_tag}'" report = if report_uri, do: ["report-uri ", report_uri, ";report-to csp-endpoint"] diff --git a/akkoma/mix.nix b/akkoma/mix.nix index 843b9eb..7ca0db5 100644 --- a/akkoma/mix.nix +++ b/akkoma/mix.nix @@ -11,6 +11,19 @@ packages = with beamPackages; with self; { + argon2_elixir = buildMix rec { + name = "argon2_elixir"; + version = "3.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0mywrvzzm76glvajzxrdg6ka49xby30fpk9zl4dxamzm18kknxcb"; + }; + + beamDeps = [comeonin elixir_make]; + }; + base62 = buildMix rec { name = "base62"; version = "1.2.2"; diff --git a/akkoma/pleroma-fe/package.json b/akkoma/pleroma-fe/package.json index b34e05c..4949c71 100644 --- a/akkoma/pleroma-fe/package.json +++ b/akkoma/pleroma-fe/package.json @@ -22,9 +22,10 @@ "@fortawesome/free-regular-svg-icons": "^6.1.2", "@fortawesome/free-solid-svg-icons": "^6.2.0", "@fortawesome/vue-fontawesome": "3.0.1", - "@kazvmoe-infra/pinch-zoom-element": "1.2.0", + "@floatingghost/pinch-zoom-element": "^1.3.1", "@vuelidate/core": "^2.0.0", "@vuelidate/validators": "^2.0.0", + "blurhash": "^2.0.4", "body-scroll-lock": "2.7.1", "chromatism": "3.0.0", "click-outside-vue3": "4.0.1", diff --git a/akkoma/pleroma-fe/source.json b/akkoma/pleroma-fe/source.json index afd467f..754515b 100644 --- a/akkoma/pleroma-fe/source.json +++ b/akkoma/pleroma-fe/source.json @@ -1,9 +1,9 @@ { "url": "https://akkoma.dev/AkkomaGang/pleroma-fe.git", - "rev": "d00e28d5e9b8a51d2f36c7d0238f8cd5a7ef4934", - "date": "2022-12-22T05:43:01+00:00", - "path": "/nix/store/bxm17cl34bby1kx4bvslrnwi8p4g3l8x-pleroma-fe", - "sha256": "16lg6s0xb56k1synd5xdw3fw4mx4xh0qm2ymva4px6akfaif3j9n", + "rev": "f288d0c219beafcf98146056ea3cdc22adeeb15a", + "date": "2023-01-02T15:16:42+00:00", + "path": "/nix/store/mfjsa44rb8rxhjd40sxi5sr49nm5hs98-pleroma-fe", + "sha256": "0c601jircdz6yh0nmbv2f05xblmzkz4189byyvlvx9rqrpr4n6fa", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/akkoma/pleroma-fe/yarn.lock b/akkoma/pleroma-fe/yarn.lock index 92cfd7c..2d1a724 100644 --- a/akkoma/pleroma-fe/yarn.lock +++ b/akkoma/pleroma-fe/yarn.lock @@ -1350,6 +1350,13 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@floatingghost/pinch-zoom-element@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@floatingghost/pinch-zoom-element/-/pinch-zoom-element-1.3.1.tgz#5f327ad17ddf1f56777098aca088fdbf99cbd049" + integrity sha512-KnE7aBQdd/Fj1TzU5uzgwD9YAQ58DTMUks/PoTEBFW4zi0lBM9cN/j45wzcnzsT2VXG1S6qM7NMmq7NGm2//Fg== + dependencies: + pointer-tracker "^2.0.3" + "@fortawesome/fontawesome-common-types@6.2.0": version "6.2.0" resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz" @@ -1516,13 +1523,6 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@kazvmoe-infra/pinch-zoom-element@1.2.0": - version "1.2.0" - resolved "https://registry.npmjs.org/@kazvmoe-infra/pinch-zoom-element/-/pinch-zoom-element-1.2.0.tgz" - integrity sha512-HBrhH5O/Fsp2bB7EGTXzCsBAVcMjknSagKC5pBdGpKsF8meHISR0kjDIdw4YoE0S+0oNMwJ6ZUZyIBrdywxPPw== - dependencies: - pointer-tracker "^2.0.3" - "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": version "5.1.1-v1" resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129" @@ -2494,6 +2494,11 @@ binary-extensions@^2.0.0: resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== +blurhash@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-2.0.4.tgz#60642a823b50acaaf3732ddb6c7dfd721bdfef2a" + integrity sha512-r/As72u2FbucLoK5NTegM/GucxJc3d8GvHc4ngo13IO/nt2HU4gONxNLq1XPN6EM/V8Y9URIa7PcSz2RZu553A== + body-parser@1.19.2: version "1.19.2" resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz" diff --git a/akkoma/pleroma-fe/yarn.nix b/akkoma/pleroma-fe/yarn.nix index 22fed4e..a5c338d 100644 --- a/akkoma/pleroma-fe/yarn.nix +++ b/akkoma/pleroma-fe/yarn.nix @@ -1159,6 +1159,14 @@ sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; } + { + name = "_floatingghost_pinch_zoom_element___pinch_zoom_element_1.3.1.tgz"; + path = fetchurl { + name = "_floatingghost_pinch_zoom_element___pinch_zoom_element_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/@floatingghost/pinch-zoom-element/-/pinch-zoom-element-1.3.1.tgz"; + sha512 = "KnE7aBQdd/Fj1TzU5uzgwD9YAQ58DTMUks/PoTEBFW4zi0lBM9cN/j45wzcnzsT2VXG1S6qM7NMmq7NGm2//Fg=="; + }; + } { name = "https___registry.npmjs.org__fortawesome_fontawesome_common_types___fontawesome_common_types_6.2.0.tgz"; path = fetchurl { @@ -1343,14 +1351,6 @@ sha512 = "bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ=="; }; } - { - name = "https___registry.npmjs.org__kazvmoe_infra_pinch_zoom_element___pinch_zoom_element_1.2.0.tgz"; - path = fetchurl { - name = "https___registry.npmjs.org__kazvmoe_infra_pinch_zoom_element___pinch_zoom_element_1.2.0.tgz"; - url = "https://registry.npmjs.org/@kazvmoe-infra/pinch-zoom-element/-/pinch-zoom-element-1.2.0.tgz"; - sha512 = "HBrhH5O/Fsp2bB7EGTXzCsBAVcMjknSagKC5pBdGpKsF8meHISR0kjDIdw4YoE0S+0oNMwJ6ZUZyIBrdywxPPw=="; - }; - } { name = "_nicolo_ribaudo_eslint_scope_5_internals___eslint_scope_5_internals_5.1.1_v1.tgz"; path = fetchurl { @@ -2431,6 +2431,14 @@ sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; }; } + { + name = "blurhash___blurhash_2.0.4.tgz"; + path = fetchurl { + name = "blurhash___blurhash_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/blurhash/-/blurhash-2.0.4.tgz"; + sha512 = "r/As72u2FbucLoK5NTegM/GucxJc3d8GvHc4ngo13IO/nt2HU4gONxNLq1XPN6EM/V8Y9URIa7PcSz2RZu553A=="; + }; + } { name = "https___registry.npmjs.org_body_parser___body_parser_1.19.2.tgz"; path = fetchurl { diff --git a/akkoma/source.json b/akkoma/source.json index bb533af..e345545 100644 --- a/akkoma/source.json +++ b/akkoma/source.json @@ -1,9 +1,9 @@ { "url": "https://akkoma.dev/AkkomaGang/akkoma.git", - "rev": "1fd5c4b221d45d736318be3f75f25bff143eda25", - "date": "2022-12-22T23:39:35+00:00", - "path": "/nix/store/q36f2ava3bpmvxs4b6fr62hhjxhfs1fb-akkoma", - "sha256": "08s55vvfm1pvgk6vls73022ngc8aw9hpf5b1kxgvza7l6canfivx", + "rev": "336d06b2a8ca75362578b1d67ea1f32a45c8edd3", + "date": "2023-01-02T15:21:19+00:00", + "path": "/nix/store/ycyv47pxxvl329a6hwn617vf09zm4zjn-akkoma", + "sha256": "0jl0ka1ksvxgv0z1cav1vj1m2caxm8v1rzf58yvg3swld07rd5bx", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/flake.lock b/flake.lock index 7c1fa99..4c5a06d 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1672288675, - "narHash": "sha256-RUqnuENaFkge6QVmm1Hmpcb15xjJX9/eU94fU4+qPTM=", + "lastModified": 1672829972, + "narHash": "sha256-bjEYbmfzubZdKsSyjbZmI0oOzzRQjQoXyLWayqbReVM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61345687940092e1cfda9aae7aec152a5a716063", + "rev": "a942dceffe7c65ddf54b57c7656c98844d61ed44", "type": "github" }, "original": { diff --git a/matrix/mautrix-signal/source.json b/matrix/mautrix-signal/source.json index 5d7c7ff..ceff6d8 100644 --- a/matrix/mautrix-signal/source.json +++ b/matrix/mautrix-signal/source.json @@ -1,9 +1,9 @@ { "url": "https://github.com/mautrix/signal", - "rev": "dc186e25cfd31c7cb57768b9b18305ed35742b31", - "date": "2022-12-14T01:21:41+02:00", - "path": "/nix/store/i4lm6agx1s053z98wsx73dklxy3j5grv-signal", - "sha256": "1ipg22fm71r281m09q9y3s9sjad445yssd64235bjbkmb7lng24k", + "rev": "ddbcd47a448974259446a92bcdf788886f73f000", + "date": "2022-12-30T12:26:43+02:00", + "path": "/nix/store/p71l04gblrk7h20wf57hmxjvsal8vbxm-signal", + "sha256": "1j1ih9a2viw45sfxba86jmbaf1kcq7w8rx3v0cyfdn1196bjampn", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/matrix/mautrix-telegram/source.json b/matrix/mautrix-telegram/source.json index 50e97e3..468d59f 100644 --- a/matrix/mautrix-telegram/source.json +++ b/matrix/mautrix-telegram/source.json @@ -1,9 +1,9 @@ { "url": "https://github.com/mautrix/telegram", - "rev": "989dc324818c06cc0c8ddd252d230404331ffbcc", - "date": "2022-12-28T13:15:13+02:00", - "path": "/nix/store/v18zvzzjpss6pl2sjgdmkqav9r4h1n57-telegram", - "sha256": "05bdb0542ji9cq38pjsml54wpmklprsnbfsw8jkcxzyfhf88jwip", + "rev": "9fae4f14d2b4fb75d82ad64a759d03ba1fce95a1", + "date": "2023-01-03T21:45:25+02:00", + "path": "/nix/store/z9k67csg3f28xvx90p93a7vhv8m9df3l-telegram", + "sha256": "1pjafjnxgpqxy7g03fy5lnpdlp6gjk8b2076ybb9yf9x5n5vaxbp", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/matrix/mautrix-whatsapp/source.json b/matrix/mautrix-whatsapp/source.json index 9100245..286458c 100644 --- a/matrix/mautrix-whatsapp/source.json +++ b/matrix/mautrix-whatsapp/source.json @@ -1,9 +1,9 @@ { "url": "https://github.com/mautrix/whatsapp", - "rev": "0305680317a0c9da1c78985a51cc67aab8891e85", - "date": "2022-12-23T15:18:16+02:00", - "path": "/nix/store/dyhcr4wa68kxr1pgz5ahi771lb7phxvn-whatsapp", - "sha256": "12w9pdph9h7ypslr90v1mjsw5aibs4pvc44n9m49qwymkx521qjw", + "rev": "1ce4e4a219a98c5843906b27ed0ef44172fd7a43", + "date": "2023-01-04T02:13:20+02:00", + "path": "/nix/store/29kxslwbxghy875y9g49gzyzdxlg4b1r-whatsapp", + "sha256": "0q49m139g13xg49qmgra2nbwgd5ph80im6q5qabk4r163cp01dlh", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/matrix/mautrix-whatsapp/vendor.sha256 b/matrix/mautrix-whatsapp/vendor.sha256 index 0b441f4..fdd591b 100644 --- a/matrix/mautrix-whatsapp/vendor.sha256 +++ b/matrix/mautrix-whatsapp/vendor.sha256 @@ -1 +1 @@ -sha256-UiNGtfnqM/X6YGob9VOYoMTCBPj0Uux2YrDI2EP0GVQ= +sha256-2LEPPaj9veVw5b3v8tGiibOyxQQr0U3cx+MEFjQcVok= diff --git a/plover/plover-rkb1-hid.json b/plover/plover-rkb1-hid.json index f54bd49..200628b 100644 --- a/plover/plover-rkb1-hid.json +++ b/plover/plover-rkb1-hid.json @@ -1,9 +1,9 @@ { "url": "https://git.chir.rs/darkkirb/plover-machine-hid", - "rev": "015dd7f97ee892825676ebca5ab0528b3802f759", - "date": "2022-10-07T08:04:57+01:00", - "path": "/nix/store/ib4y08y3hwrfx9k9hs4s217gxpfnqigv-plover-machine-hid", - "sha256": "0j4qdk36mj73cm5fg1lzzf6akmz1cljdy2csrybqjsylvyy86dx5", + "rev": "45d339b4c86068c8c88388886454ee39667d6134", + "date": "2023-01-04T12:02:31+01:00", + "path": "/nix/store/qykphr5ny4a34nakm1rif0hbqn0irni7-plover-machine-hid", + "sha256": "01m1i9wg8hbzxxcllqq5mr0nf7v0ks44v20glxnvnicqwcmsdd7m", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/python/tulir-telethon.nix b/python/tulir-telethon.nix index 5072578..9490c51 100644 --- a/python/tulir-telethon.nix +++ b/python/tulir-telethon.nix @@ -9,11 +9,11 @@ }: buildPythonPackage rec { pname = "tulir-telethon"; - version = "1.27.0a3"; + version = "1.27.0a5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3AIPl6EbY1MU59gnJyctwz0J1SxAM6JX5u2uDrJz61A="; + sha256 = "sha256-+OXKhi5ofall15vUjorNLsUk6MoF4Lcxp6lgaPOGzUw="; }; patchPhase = ''