From 45aa8223b5ee282c0bc011ab47bc6e84a50ec54a Mon Sep 17 00:00:00 2001 From: Ari Gato Date: Wed, 29 May 2024 15:28:54 +0200 Subject: [PATCH] pkgs/glitch-soc: update + minor update script changes to make the output fmt-happy --- pkgs/glitch-soc/emoji.nix | 95 ++++++++++------ pkgs/glitch-soc/gemset.nix | 155 ++++++++++++++------------ pkgs/glitch-soc/source.nix | 8 +- pkgs/glitch-soc/update-emoji-patch.sh | 4 +- 4 files changed, 149 insertions(+), 113 deletions(-) diff --git a/pkgs/glitch-soc/emoji.nix b/pkgs/glitch-soc/emoji.nix index f985788..def7efd 100644 --- a/pkgs/glitch-soc/emoji.nix +++ b/pkgs/glitch-soc/emoji.nix @@ -2,109 +2,134 @@ {fetchpatch, fetchurl}: { patches = [ (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/227a8d71b3b1f475c29f864e3572ee37ed24b139.patch"; - hash = "sha256-0uCMtrOyLjXw9OxFLFjP5geQa2XJaNUPAwfaiFbomdM="; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/4dc414453dfecd6b9a45ceccdace92812814212b.patch"; + hash = "sha256-i0zXqVW43ZQuCrGNxgVSf5/OV4AdeJDykTIgo9FHLeA="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/14c0e46ef42f853dc26e385723bd30a26d3c6aca.patch"; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/b1f2ef4f95eb1dc982561514cf96a6b4913d9083.patch"; hash = "sha256-mPTn1tSFX16H3qw6tTMoY8ZEpSFw0WwMoAlwdMdN5o8="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/28ecb2a4bebc080fba4aebfd611f502220fd2bd1.patch"; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/b63636b0a68efb1d228d2e2d095ac3856c7e4972.patch"; hash = "sha256-W54/zXblx89YfWqkkeHYpYArDPzI63S+XgPw5kbtVIQ="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/938175d5e856e54f4469f746a019955ecd16a47b.patch"; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/c6ef1a902cddaab21987fae31a80321794a10573.patch"; hash = "sha256-ShXE7LykbImUByMjpKpMrB+mvjV9Y+txwNWBQwlHYX0="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/22fc82dfeedda84b251b136a2175e5e3e9ab0e44.patch"; - hash = "sha256-oZx8NOdXqEOZImaTmubFQGXPlJQkgquLofOpKaEo7Gg="; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/638ea3bf2df621a43b58df03453a1015c4fab139.patch"; + hash = "sha256-EYNjYGTtpvMA2rX959RjD7buPeC2zRYXcqO92jUszss="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/03ea7618ad2f885a027c4c9a73eaf71510ebc622.patch"; - hash = "sha256-d9G3JijFI5gKBDfHX5RE766+v3e0GUBT6blmRxtAB/s="; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/e60b2ef24541ef626f24da577bd1ccbb29d015ce.patch"; + hash = "sha256-HpYr5hSVw39kCQd6RUUAgZvbDpZ77lwmKXhuQ6//UGk="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/4d832522b9e566a6e59778490ec50bc3ea2d2fd2.patch"; - hash = "sha256-XaV5ibRFQgReLKlTGLzA1hN8Z4EBEQhF/2GtWSFAuu0="; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/323a50c9a9a4867d2bb0003929f241c6bd102ae4.patch"; + hash = "sha256-Q8gQwOlakdulWBKT4RQ8HLq8MUuw2gBum3mHygsu1OE="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/a27b8387419b8229451b048a646f2799305b76a6.patch"; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/3150cd5ebaa7b2106e74284b9bd0ebb72a881e7f.patch"; hash = "sha256-//d36ZolRH5Z9/2tBGWAUjlbIbaXb2MQGrDUVrlPHGI="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/0838432237260d207adf57ec3f76ea8745ae7dc9.patch"; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/0fa071703cdd29387b02b7585ea7708907a0b47f.patch"; hash = "sha256-F73oi+m6905u9N/iE+0kG8a/raSPW7znDeoNSjzrWJc="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/09b64d761a6f2559eb6ed34a5e5c628894b87189.patch"; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/7691ac0053b51df419014cd84e2c5646e70b71e0.patch"; hash = "sha256-WgWtfn2UJXUz1elSPlM6PfIOG9xRgP0KVOtJ/35tY44="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/11bebd28a2f7942b1c18b40122f1fc93813daaa0.patch"; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/a624ba5621d5c26715954592cb76ab26dc4a30d4.patch"; hash = "sha256-Vj2vaxJf6Fyuew4yTZ8T8rH7sVmey3zkmlYX++L4DzQ="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/a2ab3f541cbc2ab73fd32da1864fc889e0e0513e.patch"; - hash = "sha256-BZPpWyRRSkVPVygyNYrdX115Bj6usVR4gIzsbG0zgRs="; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/b9723c99cf7397b124c207367208e571f0a56972.patch"; + hash = "sha256-QWrAHRSAUG5swVxV19Y1yg5tupnEafHzJf6j7se95A8="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/4311fff076c79335fd2a76b4abfe4f43e03a84ab.patch"; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/16b08f1d6bcc9ffd1e3316a11dc8c2def1926245.patch"; hash = "sha256-zWDnO/KLpl0aBaxS2DTt0W7WCeR29gU4N//5gZvJcwg="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/0d68ecf75dec23d23f1ad063d3200f9b2f6158c3.patch"; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/49e3973158dcb33257a12dd15d86b685b8435728.patch"; hash = "sha256-ygSdBo/9UKp9LAHNvpjvqcRF5uFpRWaqOH86gLnxYwU="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/d54affc10782bec9965ad4d913f66bc0aab91ac5.patch"; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/bec0e6dd37df9799edb14b4d8d0e63692b66cf31.patch"; hash = "sha256-haFsOBTGWWbhEvbWWVf9Sawdw/CCUa3ZVRCz3AHNlF4="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/a12b2ad57af11c8be5eb1a2fbd776d5da209bbfa.patch"; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/23f608619f1c8392dae995982c7595972147a9c8.patch"; hash = "sha256-+oUPXiHicgK1/r1lovl4IH6jZ7rDUWwBuVCDywzCPCk="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/aae6e1b1fd5073ffdb6e6cdcbdbe9bae01808f84.patch"; - hash = "sha256-4IdH4YHyBfzbb+sdtn/EB9l+7zOl9QDzh/qdA15wFoQ="; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/3c66a42d0ad7f3416c8c130cf90364ac3acbb86d.patch"; + hash = "sha256-N4yijNnCfeBb8CVsVK8L/ncRyWcvDZD9gkHaUMR1WaA="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/b07f5f89d4411e71e0a616ccffebb2140452e728.patch"; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/d37eb7f3eb4c38d00c8c4040bbba764036fb8019.patch"; hash = "sha256-SUOgcCBXlfsyMHKYvkkvgiOkW1uzLruI+jy5uf9f5kA="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/ba37843ec23cca1e537d462374f479371c4115fb.patch"; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/21e5b2ac22cff0b84549cb357b73186cc33a4872.patch"; hash = "sha256-mweLZ82np2r/kbbDJscwOomHgruULHxxlu9zhR51PNQ="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/13c9fa62fa1d07a89c34a96352e9e05f464e2e81.patch"; - hash = "sha256-TrDCWaBVAwPi5umG0FcQVdONTl2LtJ1oWi/rwgz3Y3U="; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/89273da276cd987c01d0be3c4a0d598497167fd6.patch"; + hash = "sha256-6aLwW6uJu1dXHenCnpta3nta6vZ+ZWH5pxhMGM0nLr8="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/40ae5aed66ac0dd2dfc70c5111d439db6b8e988e.patch"; - hash = "sha256-33l5CWQ5TSzXtBMJs68nmyya0l96WTCW/ZxRwCkbswM="; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/af4cbbbc185c432c6a18c1efb84222e48c44356c.patch"; + hash = "sha256-zBWsmMawNT1/1Kh4uZ7RpbIL03Gri7wsRMec/EYb/3Q="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/9b54b27bf76b155e9866a0deb52d26df35a1e101.patch"; - hash = "sha256-HIU/DuRJPRi+nQL3hWSHN6PQAoXDL0CPV91IoArhpOE="; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/277428127e505120acbe3299d41b27c68fe78c83.patch"; + hash = "sha256-srvagWbsqZQbOtk2Wfyk5LoBhoqeW0fSZXgDm0q6UEg="; }) (fetchpatch { - url = "https://github.com/glitch-soc/mastodon/pull/2462/commits/11900689bf510f19fd21376367da4d0b6371bf2a.patch"; - hash = "sha256-/Krv3fWX7IYotZJ2I/uKLqIOOB3F/OSkcWdYaUbZEI0="; + url = + "https://github.com/glitch-soc/mastodon/pull/2462/commits/e48512b008f406a1f19336e71c44d33362df2606.patch"; + hash = "sha256-wPPZkkeieMbO0jeO9VXqQyW+F+D7WmcFoXSVHGY03bM="; }) ]; files = [ { src = fetchurl { - url = "https://github.com/glitch-soc/mastodon/raw/11900689bf510f19fd21376367da4d0b6371bf2a/app%2Fjavascript%2Fimages%2Fmailer-new%2Fheading%2Freaction.png"; + url = + "https://github.com/glitch-soc/mastodon/raw/e48512b008f406a1f19336e71c44d33362df2606/app%2Fjavascript%2Fimages%2Fmailer-new%2Fheading%2Freaction.png"; hash = "sha256-6QLPNTSigxXryjO0IbvZFOQjWrnwrQHr5Mb0ZJllMLk="; }; name = "app/javascript/images/mailer-new/heading/reaction.png"; } { src = fetchurl { - url = "https://github.com/glitch-soc/mastodon/raw/11900689bf510f19fd21376367da4d0b6371bf2a/app%2Fjavascript%2Fimages%2Fmailer%2Ficon_add.png"; + url = + "https://github.com/glitch-soc/mastodon/raw/e48512b008f406a1f19336e71c44d33362df2606/app%2Fjavascript%2Fimages%2Fmailer%2Ficon_add.png"; hash = "sha256-UYDdj5GKsg1cfVTx04hwsEURk6iKZfQCMAA2UFT0SJA="; }; name = "app/javascript/images/mailer/icon_add.png"; diff --git a/pkgs/glitch-soc/gemset.nix b/pkgs/glitch-soc/gemset.nix index bed5d7e..99467ee 100644 --- a/pkgs/glitch-soc/gemset.nix +++ b/pkgs/glitch-soc/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ifiz4nd6a34z2n8lpdgvlgwziy2g364b0xzghiqd3inji0cwqp1"; + sha256 = "1kxdc5d7iyh0fjqqxr7x2l37xp48lcdpafkvsqc0p5bc4vd3qcjp"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.3"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1adqnf5zc4fdr71ykxdv5b50h7n4xfvrc0qcgwmgidi0cxkzx4r4"; + sha256 = "0qx6435q80bzk9h8hvii2vf6hq9nfb50ggm58ps8vy8jci3xh9bm"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.3"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "012mxn5dfhwbssrckw6kvf851m6rlfa87n4nikk28g05ydfsvcys"; + sha256 = "05jjaw7m6xc4lpwidpnq9pnzg4rb5ild1ivp82shr7qq7wqlixbb"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.3"; }; actionpack = { dependencies = ["actionview" "activesupport" "nokogiri" "racc" "rack" "rack-session" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n1v4r5cyac5wfdlf8bly45mnh60vbp067yjpkyb05vyszamiydq"; + sha256 = "193svay7hhjxx5p42lxjwmk22hlp2bbf6b2gjb802108h0gzs29x"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.3"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0an5sfy96cbd7f43igq47h3m228ivngqjj40gj6iqllhjhchgs7c"; + sha256 = "1vg85ff59hqndwk61kd9b5y5y7vnvm85cddrbg7la4ibkwfxa87d"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.3"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kq9b4xnwiknjqg4y6ixvv0cf1z0dcxs68inc8bx05s0fqrim6rn"; + sha256 = "1zfmqqxaj1qnwr2ic6z6axsg332p8msikn9phr1i9vy1lpia31fs"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.3"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08gjywvd65yzgjw7ynsgvi00scxc4fmgj70wajn7wsdqx00hbafj"; + sha256 = "0sd2h1l3dfl66sdvwg6xm6f7hx0pyj6wsv1mdavz0gkl104r2qgg"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.3"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p3ibps515151ja4gadrhh8frvjvvq4h5fpxw2acccv3z5i553hh"; + sha256 = "0klvgx1bvr3f9l1hg5n7cdbsqzkp42dz7if82wgw9l77rhlj1j8h"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.3"; }; activerecord = { dependencies = ["activemodel" "activesupport" "timeout"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ww1qxn12nlp0ivysq0pxj6cvajf0fbq781fr4pqx5206c690wj8"; + sha256 = "1j9m8m5y035lx2kyx04wzpspsvhadqggf4nyjlwg1xw4kpa37qrx"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.3"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09wp0qqp7xr31ipcv42bs81fmyksz9l3jmraryf53qjsbbqpfdr8"; + sha256 = "0hm10apwx80xp8qgcsfrpx2qmsvg707vpqvdvrr0rax0zq8zs25s"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.3"; }; activesupport = { dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d"; + sha256 = "0z8kygxmz99krz9pwp947znkzf0jr64sml28df0vf1gzxlg7y57i"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -218,10 +218,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ifkc90g5afwsfqaayw1sq1i0spvz7kx99sgsa5xx5h55g143j9d"; + sha256 = "1655dl8bh06kvwnpmvwq3d5nv9357fb1bbh1ipc5rbz6s92n4sbs"; type = "gem"; }; - version = "1.922.0"; + version = "1.929.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -229,10 +229,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yk0jb9h0iyqglxi53n7yzhxsia6nvir80zfsvg6kbkjp3ba7irs"; + sha256 = "0f44kp3g9g8v60f7xw769r734b7w6n774jj2njn42444ip3zwsz3"; type = "gem"; }; - version = "3.194.1"; + version = "3.196.1"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -240,10 +240,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rga6qkp038laxsl3wl2lig9yyaj788xg8aczl1wyhsdy1bi6qjm"; + sha256 = "15pllhw43qcvx99wf88a5s8a95qzaw486gaggpr16skm83ld2pdi"; type = "gem"; }; - version = "1.80.0"; + version = "1.81.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -251,10 +251,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sm44q9877bs69ik10x908wr4h12gigccpcvqxnlhaylj20n0kk6"; + sha256 = "023h9xx65dd91z1sk9znhfwp4wr48imnnhdhvczv64m17r7ych4y"; type = "gem"; }; - version = "1.149.1"; + version = "1.151.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -1066,10 +1066,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xh9qs00l1d7rxsr9qjlba8dprh9km8ya06y59qf17vncihl1xa7"; + sha256 = "0k723mwj17jssa1zm0mpi4sapsrllg9yphkm4zjg451g8bqkjjpq"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; formatador = { groups = ["default"]; @@ -1552,10 +1552,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vvvaz2ngaxv0s6sj25gdvp73vd8pfl8q3jharadg18p3va0m1ik"; + sha256 = "0q4qfi5wnn5bv93zjf10agmzap3sn7gkfmdbryz296wb1vz1wf9z"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.0"; }; link_header = { groups = ["default"]; @@ -1679,10 +1679,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455"; + sha256 = "0kybw1a6f7d1ipyawnpi5cwiy05rkz9qwglgfvhmd1z0l2gcigmm"; type = "gem"; }; - version = "3.2024.0305"; + version = "3.2024.0507"; }; mini_mime = { groups = ["default" "development" "test"]; @@ -1709,10 +1709,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a"; + sha256 = "181rfs9drd34b3akbfbfg0ynz07v74pfkzbb977bxa50nrlqwj2c"; type = "gem"; }; - version = "5.22.3"; + version = "5.23.0"; }; msgpack = { groups = ["default"]; @@ -1782,10 +1782,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zn7j2w0hc622ig0rslk4iy6yp3937dy9ibhyr1mwwx39n7paxaj"; + sha256 = "1y0pzapcasfjayk4nydy04hnx11xmsv8jl8myizxhbpkdmrl10dc"; type = "gem"; }; - version = "0.4.10"; + version = "0.4.11"; }; net-ldap = { groups = ["default"]; @@ -1835,10 +1835,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15iwbiij52x6jhdbl0rkcldnhfndmsy0sbnsygkr9vhskfqrp72m"; + sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.3"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -1846,10 +1846,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i8g0i370jhn2sclml0bg9qlrgf4csi6sy7czbhx8kjbl71idhb2"; + sha256 = "1lla2macphrlbzkirk0nwwwhcijrfymyfjjw1als0kwqd0n1cdpc"; type = "gem"; }; - version = "1.16.4"; + version = "1.16.5"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; @@ -2152,10 +2152,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bpw2vnn5yir8avqymrpcnxp08fmq8kwa7lsvn5rbqxyvaywbfx1"; + sha256 = "1k9m9v4i42y53s85b8y7vz4dj4y00v1gg8392rkrswl5f72fk2dn"; type = "gem"; }; - version = "0.27.2"; + version = "0.27.3"; }; opentelemetry-instrumentation-rack = { dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; @@ -2418,10 +2418,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.0"; }; rack = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -2527,10 +2527,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "185zq5r9g56sfks852992bm0xf2vm9569jyiz5jyww3vx1jply1d"; + sha256 = "1pl2jgnbm9p031jvbihpbnpwn005107xb1794ps0ayairb6qhldn"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.3"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2582,10 +2582,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0435sfvhhrd4b2ic9b4c2df3i1snryidx7ry9km4805rpxfdbz2r"; + sha256 = "02xic4iyvqxj4hs5xzywg4zrff8s77c7xb1jchjfmdrzclnz51zx"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.3"; }; rainbow = { groups = ["default" "development"]; @@ -2687,10 +2687,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ndxm0xnv27p4gv6xynk6q41irckj76q1jsqpysd9h6f86hhp841"; + sha256 = "0ik40vcv7mqigsfpqpca36hpmnx0536xa825ai5qlkv3mmkyf9ss"; type = "gem"; }; - version = "2.9.0"; + version = "2.9.2"; }; reline = { dependencies = ["io-console"]; @@ -2698,10 +2698,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gjpvnd0krf50qb928wijni2d8n04bwnm5szjsragnjv86d8iyhc"; + sha256 = "06rlp3wjcbwbgw3xlawclzzmj6ryn6ap65nh54x5yzgx0c3jlqqz"; type = "gem"; }; - version = "0.5.6"; + version = "0.5.7"; }; request_store = { dependencies = ["rack"]; @@ -2726,14 +2726,15 @@ version = "3.1.1"; }; rexml = { + dependencies = ["strscan"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "0d8ivcirrrxpkpjc1c835wknc9s2fl54xpw08s177yfrh5ish209"; type = "gem"; }; - version = "3.2.6"; + version = "3.2.8"; }; rotp = { groups = ["default"]; @@ -2825,10 +2826,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rkzkcfk2x0qjr5fxw6ib4wpjy0hqbziywplnp6pg3bm2l98jnkk"; + sha256 = "0f3vgp43hajw716vmgjv6f4ar6f97zf50snny6y3fy9kkj4qjw88"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.1"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -2847,10 +2848,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fa24jhdv9x0kszvn8a394irhjnqhryafws6m1qv9ax2wja5nqny"; + sha256 = "08sbi3cdh6pxj0mj34vzr7675rb4n2r2q5yxlgs0w9xnm5c0jpdx"; type = "gem"; }; - version = "4.2.0"; + version = "5.0.0"; }; rspec-support = { groups = ["default" "development" "test"]; @@ -2868,10 +2869,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zkdxkhvhmxap5w2rncpmrq40dw0pbz81sa1ivsr7kh0p8j0a9x3"; + sha256 = "0ig2f3lisgq1ybkk3vs640hfgmhxggx6agv2wwy617sc6chhhzf6"; type = "gem"; }; - version = "1.63.5"; + version = "1.64.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2923,10 +2924,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06dcxrr71sn0kkw8fwh0w884zbig2ilxpkl66s7lcis9jmkggv83"; + sha256 = "13d6dmkjln887x4z161r3mnn6sqwbzawb9czk51yhrsd2n0j72pn"; type = "gem"; }; - version = "2.24.1"; + version = "2.25.0"; }; rubocop-rspec = { dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot" "rubocop-rspec_rails"]; @@ -3051,10 +3052,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b5277ypgzjrhqgsm3c8954md0ffj116gnl921k6vldy8l6s032n"; + sha256 = "0qrjr30qs01b27km6ipzc2zasdlzhdgri5q7qrb53z1j8l0n82y3"; type = "gem"; }; - version = "4.20.1"; + version = "4.21.1"; }; semantic_range = { groups = ["default"]; @@ -3225,6 +3226,16 @@ }; version = "1.8.0"; }; + strscan = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; + type = "gem"; + }; + version = "3.1.0"; + }; swd = { dependencies = ["activesupport" "attr_required" "httpclient"]; groups = ["default"]; @@ -3516,10 +3527,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07zk8ljq5kyd1mm9qw3452fcnf7frg3irh9ql8ln2m8zbi1qf1qh"; + sha256 = "158d2ikjfzw43kgm095klp43ihphk0cv5xjprk44w73xfv03i9qg"; type = "gem"; }; - version = "3.23.0"; + version = "3.23.1"; }; webpacker = { dependencies = ["activesupport" "rack-proxy" "railties" "semantic_range"]; @@ -3622,10 +3633,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m67qmsak3x8ixs8rb971azl3l7wapri65pmbf5z886h46q63f1d"; + sha256 = "0ayraiqfhhjzpyr4yxp035002lq78ip1zhr0ix87rn3rqpnsrn3h"; type = "gem"; }; - version = "2.6.13"; + version = "2.6.14"; }; } diff --git a/pkgs/glitch-soc/source.nix b/pkgs/glitch-soc/source.nix index f982dea..fde2267 100644 --- a/pkgs/glitch-soc/source.nix +++ b/pkgs/glitch-soc/source.nix @@ -4,8 +4,8 @@ src = fetchFromGitHub { owner = "glitch-soc"; repo = "mastodon"; - rev = "7c81666f7f8d7c0321d12899680f6e0b5bf3757a"; - hash = "sha256-myxCbzi6mDwSzlRULW2695ggPUGOEAn6K2PWQ/tuov4="; + rev = "e7aeacccb147174f5fb527c02036a2cd5f82cef6"; + hash = "sha256-nnIjDDWZPBeMB6ezpsOZgdxtb+f8LRhx6X0RNTRMDB8="; }; inherit patches; nativeBuildInputs = [ gawk gnused ]; @@ -18,6 +18,6 @@ sed -i -Ee 's|^ checksum: ([^/]*)$| checksum: '$cacheKey'/\1|g;' yarn.lock ''; }) // { - version = "unstable-2024-05-14"; - yarnHash = "sha256-tw5EiPWNpzGjjLkTx++W82bA5ZZiJCzU1BELgXU+d1M="; + version = "unstable-2024-05-29"; + yarnHash = "sha256-haLT8KnJr1r4VPjeXfR5nm0yUbAbeB+D9reOXrdfwCY="; } diff --git a/pkgs/glitch-soc/update-emoji-patch.sh b/pkgs/glitch-soc/update-emoji-patch.sh index eb56d56..5974181 100755 --- a/pkgs/glitch-soc/update-emoji-patch.sh +++ b/pkgs/glitch-soc/update-emoji-patch.sh @@ -8,13 +8,13 @@ echo -e "# autogenerated file\n{fetchpatch, fetchurl}: {\n patches = [" > emoji curl 'https://api.github.com/repos/glitch-soc/mastodon/pulls/2462/commits' | jq -r 'map(.sha) | .[]' | while read sha; do url="https://github.com/glitch-soc/mastodon/pull/2462/commits/$sha.patch" hash="$(nix-prefetch fetchpatch --url "$url")" - echo -e ' (fetchpatch {\n url = "'$url'";\n hash = "'$hash'";\n })' >> emoji.nix + echo -e ' (fetchpatch {\n url =\n "'$url'";\n hash = "'$hash'";\n })' >> emoji.nix done echo -e ' ];\n files = [' >> emoji.nix curl 'https://api.github.com/repos/glitch-soc/mastodon/pulls/2462/files?per_page=100' | jq -c 'map(select(has("patch")|not) | {name:.filename,url:.raw_url}) | .[]' | while read json; do name="$(jq -r '.name' <<<"$json")" url="$(jq -r '.url' <<<"$json")" hash="$(nix-prefetch fetchurl --url "$url")" - echo -e ' {\n src = fetchurl {\n url = "'$url'";\n hash = "'$hash'";\n };\n name = "'$name'";\n }' >> emoji.nix + echo -e ' {\n src = fetchurl {\n url =\n "'$url'";\n hash = "'$hash'";\n };\n name = "'$name'";\n }' >> emoji.nix done echo -e ' ];\n}' >> emoji.nix