diff --git a/pkgs/glitch-soc/emoji.nix b/pkgs/glitch-soc/emoji.nix index 4852bd1..b7bb737 100644 --- a/pkgs/glitch-soc/emoji.nix +++ b/pkgs/glitch-soc/emoji.nix @@ -3,155 +3,150 @@ patches = [ (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/527f271f5b87da47c9c9c7ef9b28d21543744cfd.patch"; - hash = "sha256-3GYLSM4nS9p60WhGUES6nIb1jYKUtBv4mabJxndEFQw="; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/26db44dc45862246b50eb2e4d6f5cb119f6c2646.patch"; + hash = "sha256-WBesdYAjTl9+DT1oywtAqo/unV4AzY/gEMTIkTjinpg="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/1366cdc74f7be0816e741e7e6bbd68cc00c228af.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/1d11688c3e097738f6da8567f85fe9ae24d84321.patch"; hash = "sha256-jN2286+CfPXMbAX0urBDqmQa6/Xfdwa9qt5urs/gFY4="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/8b0db7aa4628b54626d7768990714e189762b3bc.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/d5f7e91d687b2626b7b13a9478fe787851c2afa3.patch"; hash = "sha256-W54/zXblx89YfWqkkeHYpYArDPzI63S+XgPw5kbtVIQ="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/47026bd4b3dd0a0e09083410030ce683e70dd90c.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/b19dce51fcae4f55df5f23ca671a09ad1cbf2775.patch"; hash = "sha256-ShXE7LykbImUByMjpKpMrB+mvjV9Y+txwNWBQwlHYX0="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/ce4a67068417f6b51fe1f4aed050879ee18168d1.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/04aee9593792682dd36f465d0888ab1c752b4973.patch"; hash = "sha256-IWYVmQCUs/dVNfGFGElk3vAts+zLIfwB2Uhc8T5tQpA="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/e04e53383220135627c929e9ba1520ef96284593.patch"; - hash = "sha256-IFiTajIe1LvQcHfY0bgftoXq4ZLN+KdRHHW2NRd+VDM="; - }) - (fetchpatch { - url = - "https://github.com/arachnist/mastodon/pull/1/commits/67dd1063c469c2ebf0f9c18ebdf8737b57df25a4.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/a3185f460c5283a2168969d47371f9b47504a00d.patch"; hash = "sha256-B7qegWOzzW9spS2k/ZqhDuFifvyPeDA9zCcgVkSp1lI="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/24e683dbc120dc0c001fb1c8f44bc0891c1ebd0c.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/16ce3825631760ce606f5c51a792d8da4a29f0be.patch"; hash = "sha256-//d36ZolRH5Z9/2tBGWAUjlbIbaXb2MQGrDUVrlPHGI="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/400495405f3539e6a08eda660c8ea78ad5a9e386.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/34df4d55c23f8a47646b1446f0eb77a1f8a0c352.patch"; hash = "sha256-F73oi+m6905u9N/iE+0kG8a/raSPW7znDeoNSjzrWJc="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/3925946cfa90886d06ae4e4cea635041fe895dbe.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/b592ed291f79689585153dc1117777084f0ca0d8.patch"; hash = "sha256-WgWtfn2UJXUz1elSPlM6PfIOG9xRgP0KVOtJ/35tY44="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/e51344fd4c55fbc2243c27a72ab2078bb24a1c09.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/17adba2d3d77231254da6ef20633e1aabaf78c1a.patch"; hash = "sha256-Vj2vaxJf6Fyuew4yTZ8T8rH7sVmey3zkmlYX++L4DzQ="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/8a4b49a39a0b11803d3a4d661ad7080b181807c2.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/896b459bc0d5f86558a403b88094b62121cdab07.patch"; hash = "sha256-chZ5T+YNzSGG3zNTWus/0FZXGUd/ToiUt/IFG30UbU0="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/5dea8fb50816187aa4973f1d2bbfe4ecb3161d45.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/41792d49c6279408635a71ad6fe8044b5449c83f.patch"; hash = "sha256-zWDnO/KLpl0aBaxS2DTt0W7WCeR29gU4N//5gZvJcwg="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/d9f82d9477424a3c5215372725dff49b2a9b72d3.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/d337e1b88cc8cc49a2ad6102d08d39775228175e.patch"; hash = "sha256-ygSdBo/9UKp9LAHNvpjvqcRF5uFpRWaqOH86gLnxYwU="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/c23e458dd4168fb2da878631b184654cfd524732.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/f06664bd7144c5b4b2fda124893f9681c18655f9.patch"; hash = "sha256-haFsOBTGWWbhEvbWWVf9Sawdw/CCUa3ZVRCz3AHNlF4="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/c1ea7377186b47d1b46d864bbb09ac2af5449298.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/7c1a4515425c9fba355f545558e9bdfb13be6814.patch"; hash = "sha256-+oUPXiHicgK1/r1lovl4IH6jZ7rDUWwBuVCDywzCPCk="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/0b35996adc5f7097df4093f9448622070e79dd11.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/657e7f433d03dc83196189a7e63c2e5e7f20da3e.patch"; hash = "sha256-chbMtp949fdnu027LjNNOLIHtnG/DZdAuCzurpaROc0="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/5ec0ebd0dcf99100076b375794bcaefc8b1add25.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/764bbba328e1632b6d507a294a440a1031f883e5.patch"; hash = "sha256-SUOgcCBXlfsyMHKYvkkvgiOkW1uzLruI+jy5uf9f5kA="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/aa79cfaefd4ba3849c5d0d1c71eb731a2f553803.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/59dbe9df6537e65a4691d8c5d1195c919d0ef7dc.patch"; hash = "sha256-mweLZ82np2r/kbbDJscwOomHgruULHxxlu9zhR51PNQ="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/338715a04bb0693316ad7852d57d3562c535d19a.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/833226592ad2ebfe58991503debe5528a1ae18d6.patch"; hash = "sha256-AXtLtSUL9OrJ0UM6jvmb57NfZs1RUWVDbjerv2siANI="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/21155677bfdb7cee9cda1096944e38811660fe2c.patch"; - hash = "sha256-Qx8yhfpoJEEXII/dtekAvcSI2fh8DTPqVAhwsanIYKE="; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/053bc5387905646246f4d4a1ccf5edf56958dc46.patch"; + hash = "sha256-Ie84C6Pq6euKIVUskS0yu9x5H1mnEg9OjAb4FraTzEQ="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/fa2890142bc4e2be4c5d8de69d8078bfb5b44246.patch"; - hash = "sha256-/2QCMiswc6kmaz4rMNsLfx55PtFqZtDbenMBAjaANjw="; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/9a7cda9d70365bf3fcc7f825b422d7ad04db7653.patch"; + hash = "sha256-EVwrIHIOJtUlVLhARDiA9W/W4eoUZnOiYEvPAE20BGU="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/afe973f098cd753446f4bb719a06cf4009710fe3.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/d02b8ab2183e10aa07d05e11becd340987c6c067.patch"; hash = "sha256-qWLhyNBX4dLmYXW1cEd2AklqHTBWYernEKqljbKZqV4="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/0e4e8e49f1758c025f5ab7a2a46aab83a5fe5bfd.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/e03227fa8d7cb6bcf06cb565c6d377458a8343f8.patch"; hash = "sha256-NzPDILSEQvcVqARq400nu7ImrPiYlHb0ye5AEexrVrs="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/29812719eeb7c7ab93078e6f762548d835ee5762.patch"; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/6c382e4c6696b177915085081e7915b0ea042995.patch"; hash = "sha256-gvXd0BRQO+pAnH6+2fyxucrntbYw2Fcx7XmiMxs8y+g="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/f93e16b675b967bd6e329c7b9cb879ba64dfb558.patch"; - hash = "sha256-Pef2pVVCrmNiEA+ZKMea+wGjF5PFsQrICUy0d956m8Y="; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/346a5ff8cb5f672880aefdca07f054ae81a209ae.patch"; + hash = "sha256-c4vQjCLkZ0GTvchROwsGixzZ1twE0PdZOiRI09TcS6g="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/7fe5f8140175d2b4115f42466f5210cab43fc80d.patch"; - hash = "sha256-g1sBp6Dbvh30oJtUosrispCLFfoNLADObAM6NAHWHwc="; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/b1ee05e6c0b2b6d2101ee13bd0b93e1937517ff5.patch"; + hash = "sha256-rM1LtE/psCV+l6GcCZOM0tfb0gVj936plNzllhD+S/8="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/ab93e8f78d4f71b18fad5f81914caec90e16bba8.patch"; - hash = "sha256-pLlfsSv070h1rXQ1l7aZ1272VnS9piTZsiMl4NpyJFw="; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/1d05f28ba93b0c2a243c5023d8c8b8d734ac7ab8.patch"; + hash = "sha256-bgPO9wrX0RU5JvDYVZibpAC+DF7tk4mcqeEj164r0Oo="; }) (fetchpatch { url = - "https://github.com/arachnist/mastodon/pull/1/commits/c2273edfe2bf675c38948fdbae1c9c62c5e1f54a.patch"; - hash = "sha256-bgPO9wrX0RU5JvDYVZibpAC+DF7tk4mcqeEj164r0Oo="; + "https://github.com/glitch-soc/mastodon/pull/2462/commits/f136acbaed4c87b5f0b078dbaddac81295b1718b.patch"; + hash = "sha256-Aj/yi4uVT1QH2Aln1wRhKKyJOqqTCEg6WiGrBTYF4f0="; }) ]; files = [ { src = fetchurl { url = - "https://github.com/arachnist/mastodon/raw/c2273edfe2bf675c38948fdbae1c9c62c5e1f54a/app%2Fjavascript%2Fimages%2Fmailer-new%2Fheading%2Freaction.png"; + "https://github.com/glitch-soc/mastodon/raw/f136acbaed4c87b5f0b078dbaddac81295b1718b/app%2Fjavascript%2Fimages%2Fmailer-new%2Fheading%2Freaction.png"; hash = "sha256-6QLPNTSigxXryjO0IbvZFOQjWrnwrQHr5Mb0ZJllMLk="; }; name = "app/javascript/images/mailer-new/heading/reaction.png"; @@ -159,7 +154,7 @@ { src = fetchurl { url = - "https://github.com/arachnist/mastodon/raw/c2273edfe2bf675c38948fdbae1c9c62c5e1f54a/app%2Fjavascript%2Fimages%2Fmailer%2Ficon_add.png"; + "https://github.com/glitch-soc/mastodon/raw/f136acbaed4c87b5f0b078dbaddac81295b1718b/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 b80faa6..5720f12 100644 --- a/pkgs/glitch-soc/gemset.nix +++ b/pkgs/glitch-soc/gemset.nix @@ -218,10 +218,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18jiikxcd4sqhhfvph90s1b46gci3jbcw8hi7gaw65nghm6340hl"; + sha256 = "1glrr12rrbckny63wclrwiy9458f9nyy39j14j37mizw0bm8wxv2"; type = "gem"; }; - version = "1.966.0"; + version = "1.969.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -229,10 +229,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l5c37gvarb3p3zsip1p9mpmir0zdccp0aibgx9cy61im4pwaj0q"; + sha256 = "14a2n77asjjihayld40avh3wwzlshwkrb3dcgvnw4gvrq01jbd82"; type = "gem"; }; - version = "3.201.5"; + version = "3.202.1"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -488,6 +488,17 @@ }; version = "7.6.0"; }; + childprocess = { + dependencies = ["logger"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v5nalaarxnfdm6rxb7q6fmc6nx097jd630ax6h9ch7xw95li3cs"; + type = "gem"; + }; + version = "5.1.0"; + }; chunky_png = { groups = ["default"]; platforms = []; @@ -554,10 +565,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00c6x4ha7qiaaf88qdbyf240mk146zz78rbm4qwyaxmwlmk7q933"; + sha256 = "1rbdzl9n8ppyp38y75hw06s17kp922ybj6jfvhz52p83dg6xpm6m"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; crack = { dependencies = ["bigdecimal" "rexml"]; @@ -586,10 +597,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rhqn05w27w2mjrf0a6ppb4fxpxbfvyhwgdxa8z886jr4qnhywzb"; + sha256 = "0xs3d0ihwg1z4h28d51hb07k926d1rlwy6c2c9ygbicg76srk0qa"; type = "gem"; }; - version = "1.17.1"; + version = "1.19.0"; }; csv = { groups = ["default"]; @@ -712,10 +723,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; + sha256 = "07pj4z3h8wk4fgdn6s62vw1lwvhj0ac0x10vfbdkr9xzk7krn5cn"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; domain_name = { groups = ["default"]; @@ -774,10 +785,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g3y2h1fi8bx2ad3n7y6hfwq22691xnbp1h3af440qs8dgripwp3"; + sha256 = "11pw5x7kg6f6m8rqy2kpbzdlnvijjpmbqkj2gz8237wkbl40y27d"; type = "gem"; }; - version = "7.17.10"; + version = "7.17.11"; }; elasticsearch-api = { dependencies = ["multi_json"]; @@ -785,10 +796,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k1qnf3y1rc0i2cj182j2qn6bj63z3lw0rw2hbbksbvgv0pmlc1a"; + sha256 = "01wi43a3zylrq2vca08vir5va142g5m3jcsak3rprjck8jvggn7y"; type = "gem"; }; - version = "7.17.10"; + version = "7.17.11"; }; elasticsearch-dsl = { groups = ["default"]; @@ -801,15 +812,15 @@ version = "0.1.10"; }; elasticsearch-transport = { - dependencies = ["faraday" "multi_json"]; + dependencies = ["base64" "faraday" "multi_json"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0prvwp083mayfggifcjnwjpnw5arw8v6qw9w8fb56lagsrpwgfhj"; + sha256 = "00qgyyvjyyv7z22qjd408pby1h7902gdwkh8h3z3jk2y57amg06i"; type = "gem"; }; - version = "7.17.10"; + version = "7.17.11"; }; email_spec = { dependencies = ["htmlentities" "launchy" "mail"]; @@ -941,10 +952,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; faraday-net_http_persistent = { groups = ["default"]; @@ -1039,15 +1050,15 @@ version = "1.3.2"; }; flatware = { - dependencies = ["thor"]; + dependencies = ["drb" "thor"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wh1difcakz9n7kb8mpd66ljf1yaxla48d6rgvb90haq7c0rd16h"; + sha256 = "13wcwdpdx1asjxvqpyxwlcazzsjisls28jjn28d9cqw9zwszcm1p"; type = "gem"; }; - version = "2.3.2"; + version = "2.3.3"; }; flatware-rspec = { dependencies = ["flatware" "rspec"]; @@ -1055,10 +1066,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jgzr4n6cpfng21m3ixlgj3v48xmprs9cphs5dpds7issrsakw0a"; + sha256 = "0dgl20mi9a5iwcy6v9jq148ljy9rrvyjhp1rpd1sgadfw6kxzbhc"; type = "gem"; }; - version = "2.3.2"; + version = "2.3.3"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1152,10 +1163,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lg51gh8n6c0a38vin94zf0k9qz32hd9y8wqjpqljnkhjfzgpkix"; + sha256 = "0sqmmfdxjp3fy7hzvl35bnd0yb0ds9030np5jqh338qz4w661cap"; type = "gem"; }; - version = "1.14.0"; + version = "1.15.0"; }; haml = { dependencies = ["temple" "thor" "tilt"]; @@ -1195,10 +1206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jf9dxgjz6z7fvymyz2acyvn9iyvwkn6d9sk7y4fxwbmfc75yimm"; + sha256 = "0slky0n6n12gjgimzdbdigpwyg5wgq8fysjwkzzfw33ff8b675n7"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; hashie = { groups = ["default"]; @@ -1222,14 +1233,15 @@ version = "7.1.0"; }; highline = { + dependencies = ["reline"]; groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02ghhvigqbq4252gsi4w8a9klkdkybmbz29ghfp1y6sqzlcb466a"; + sha256 = "1q0f7izfi542sp93gl276spm0xyws1kpqxm0alrwwmz06mz4i0ks"; type = "gem"; }; - version = "3.0.1"; + version = "3.1.1"; }; hiredis = { groups = ["default"]; @@ -1362,10 +1374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mimwp5d6j52n4givnsyhmym3173rv4bfirhmlcxc7s05qymwk7l"; + sha256 = "03x1z55sh7cpb63g46cbd6135jmp13idcgqzqsnzinbg4cs2jrav"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; io-console = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -1457,10 +1469,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bq393nrxa7hmphc3li8idgxdnb5hwgj15d0q5qsh4l5g1qvrnm"; + sha256 = "0yn0k02pdb7ds1fszwadxqdsjbkm7xjkfhwpzy7iqij47g0kwv7g"; type = "gem"; }; - version = "4.3.1"; + version = "5.0.0"; }; jsonapi-renderer = { groups = ["default"]; @@ -1547,15 +1559,15 @@ version = "3.17.0.3"; }; launchy = { - dependencies = ["addressable"]; + dependencies = ["addressable" "childprocess"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06r43899384das2bkbrpsdxsafyyqa94il7111053idfalb4984a"; + sha256 = "0b3zi9ydbibyyrrkr6l8mcs6l7yam18a4wg22ivgaz0rl2yn1ymp"; type = "gem"; }; - version = "2.5.2"; + version = "3.0.1"; }; letter_opener = { dependencies = ["launchy"]; @@ -1601,7 +1613,7 @@ version = "0.5.0"; }; logger = { - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1711,10 +1723,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "104r7glqjal9fgvnv49wjzp4ssai9hmyn3npkari51s2ska3jnr0"; + sha256 = "1vdgz66z8kgw9xrwvrzrcjb5dary9k9hwm0pkk5fq6f5h6i73zds"; type = "gem"; }; - version = "3.2024.0702"; + version = "3.2024.0820"; }; mini_mime = { groups = ["default" "development" "test"]; @@ -1771,10 +1783,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1033p35166d9p97y4vajbbvr13pmkk9zwn7sylxpmk9jrpk8ri67"; + sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; mutex_m = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -1814,10 +1826,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rc08fxm10vv73bg0nqyp5bdvl4cvzb3y4cdk4kwmxx414zln652"; + sha256 = "0gdmhc6nh8cdq2hdlqyrmnl2pdmvab9j7s6fpfvq5kyga0fi4s74"; type = "gem"; }; - version = "0.4.14"; + version = "0.4.15"; }; net-ldap = { groups = ["default"]; @@ -1986,10 +1998,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08smcww0ayv3xh5bpnx2ih2cw4r48kbb44ww2p3kbfgl0ifpghz1"; + sha256 = "0dj0cqxz0fl2934pmq4pvnb4wpapjfcsjnzb8vll08bcspjdwcx7"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; opentelemetry-common = { dependencies = ["opentelemetry-api"]; @@ -1997,10 +2009,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pp7i09wp5kp1npp3l8my06p7g06cglb1bi61nw8k3x5sj275kgq"; + sha256 = "160ws06d8mzx3hwjss2i954h8r86dp3sw95k2wrbq81sb121m2gy"; type = "gem"; }; - version = "0.20.1"; + version = "0.21.0"; }; opentelemetry-exporter-otlp = { dependencies = ["google-protobuf" "googleapis-common-protos-types" "opentelemetry-api" "opentelemetry-common" "opentelemetry-sdk" "opentelemetry-semantic_conventions"]; @@ -2008,10 +2020,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0saiiaf5bkg95fjcq6asz5w86s6zg76xb0r93dcffhvnz36z0r2v"; + sha256 = "1yl10v1vvb9krvvks0si5nbjpknz8lcbbcryqkf2g0db3kha072d"; type = "gem"; }; - version = "0.28.1"; + version = "0.29.0"; }; opentelemetry-helpers-sql-obfuscation = { dependencies = ["opentelemetry-common"]; @@ -2301,10 +2313,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "145bn5q7ysnjj02jdf1x4nc1f0xxrv7ihgz9yr1j7sinmawqkq0j"; + sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; type = "gem"; }; - version = "1.25.1"; + version = "1.26.3"; }; parser = { dependencies = ["ast" "racc"]; @@ -2312,10 +2324,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ly2wind06nylyqa5724ld2l0l46d3ag4fm04ifjgw7qdlpf94d"; + sha256 = "1rn9d4j8mqljaq2ikfmlm374v2flml9mgzsqfa9zh7ra1ilsivvi"; type = "gem"; }; - version = "3.3.4.0"; + version = "3.3.4.2"; }; parslet = { groups = ["default"]; @@ -2365,10 +2377,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvy5lxq287izy7qsz23hry63rc57wkaaalqvxnwjncm56xgdmzh"; + sha256 = "1ryivdnij1990hcqqmq4s0x1vjvfl0awjc9b91f8af17v2639qhg"; type = "gem"; }; - version = "1.23.0"; + version = "1.27.0"; }; premailer-rails = { dependencies = ["actionmailer" "net-smtp" "premailer"]; @@ -2783,10 +2795,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zd1pdldi6h8x27dqim7cy8m69xr01aw5c8k1zhkz497n4np6wgk"; + sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy"; type = "gem"; }; - version = "4.2.1"; + version = "4.3.0"; }; rpam2 = { groups = ["default" "pam_authentication"]; @@ -2847,10 +2859,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0022nxs9gqfhx35n4klibig770n0j31pnkd8anz00yvrvkdghk41"; + sha256 = "0nm4qx9bgfzwfc1q0l3sj50vf88q1mbwkkqndbzc08wrnd5bjpsn"; type = "gem"; }; - version = "3.13.1"; + version = "3.13.2"; }; rspec-github = { dependencies = ["rspec-core"]; @@ -2880,10 +2892,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vh7fp402vfr7bkx7psby4fi3jkyjf48k57grkz3pxqnrc3py9ja"; + sha256 = "0vbda8x4ifd03ym9mqgk9h254qqdhxga709wm3kdrw8xmvkbrjc7"; type = "gem"; }; - version = "6.1.4"; + version = "7.0.0"; }; rspec-sidekiq = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks" "sidekiq"]; @@ -2923,10 +2935,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "063qgvqbyv354icl2sgx758z22wzq38hd9skc3n96sbpv0cdc1qv"; + sha256 = "1hbrxmffc6bwc08sx8gh9fwp6n7qymgggn4n0dh8pzx8g8xwx1ka"; type = "gem"; }; - version = "1.31.3"; + version = "1.32.1"; }; rubocop-capybara = { dependencies = ["rubocop"]; @@ -3095,10 +3107,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00dq3450kadsvxh1lpndasy0bab0ilrjhrnvlicfmkvrx3gfs2j9"; + sha256 = "09irqp6f1n85434kbqs6yfrqiw9fkkf8zbg7hnjm2nhjm6w7ij00"; type = "gem"; }; - version = "4.23.0"; + version = "4.24.0"; }; semantic_range = { groups = ["default"]; @@ -3337,20 +3349,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; tilt = { groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p3l7v619hwfi781l3r7ypyv1l8hivp09r18kmkn6g11c4yr1pc2"; + sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; timeout = { groups = ["default" "development" "test"]; @@ -3368,10 +3380,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v8y5dibsyskv1ncdgszhxwzq0gzmvb0zl7sgmx0xvsgy86dhcz1"; + sha256 = "18xc7hyasg5ja2i2vb23d9c5pd6rf316kzwqxqx5d8vbs2z1a4rw"; type = "gem"; }; - version = "0.12.0"; + version = "0.12.1"; }; tty-color = { groups = ["default"]; @@ -3494,10 +3506,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; + sha256 = "07ndgxyhzd02cg94s6rnfhkb9rwx9z72lzk368sa9j78wc9qnbfz"; type = "gem"; }; - version = "0.13.0"; + version = "0.13.1"; }; validate_email = { dependencies = ["activemodel" "mail"]; @@ -3666,10 +3678,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b1azc3qlyzlnld4d5yav9j13dlqlyygnml5qf4gqpzaj861d588"; + sha256 = "10cpfdswql21vildiin0q7drg5zfzf2sahnk9hv3nyzzjqwj2bdx"; type = "gem"; }; - version = "2.6.17"; + version = "2.6.18"; }; } diff --git a/pkgs/glitch-soc/source.nix b/pkgs/glitch-soc/source.nix index 867891a..e03a8b9 100644 --- a/pkgs/glitch-soc/source.nix +++ b/pkgs/glitch-soc/source.nix @@ -4,8 +4,8 @@ src = fetchFromGitHub { owner = "arachnist"; repo = "mastodon"; - rev = "202b2811dc4d6cb294e051641535b7df58ed066e"; - hash = "sha256-PGnICZc5E2aM+65Uscpm/5VEAwm3DLuixSOwCMKz3T0="; + rev = "5be1afa4138ffa0f5e95f18ab940a3b72612f5cd"; + hash = "sha256-iXc5HVLmB0tuzf9YpThg1jN8EMZE98CFWFPRiXs2Kpk="; }; inherit patches; nativeBuildInputs = [ gawk gnused ]; @@ -18,6 +18,6 @@ sed -i -Ee 's|^ checksum: ([^/]*)$| checksum: '$cacheKey'/\1|g;' yarn.lock ''; }) // { - version = "unstable-2024-08-28"; - yarnHash = "sha256-/NfIK+jayQ6Ikcw5oBbOUI621sS6Hld05Wj9YuIvEJQ="; + version = "unstable-2024-09-03"; + yarnHash = "sha256-9Sess8QW3wkSQ1z776TVmb8FUbmvS6LTuK5oqvyFtjY="; } diff --git a/pkgs/glitch-soc/update-emoji-patch.sh b/pkgs/glitch-soc/update-emoji-patch.sh index 6690dd5..c523dc8 100755 --- a/pkgs/glitch-soc/update-emoji-patch.sh +++ b/pkgs/glitch-soc/update-emoji-patch.sh @@ -3,15 +3,23 @@ cd "$(dirname "${BASH_SOURCE[0]}")" +#-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" +#+curl 'https://api.github.com/repos/arachnist/mastodon/pulls/1/commits' | jq -r 'map(.sha) | .[]' | while read sha; do +#+ url="https://github.com/arachnist/mastodon/pull/1/commits/$sha.patch" +# +#-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 +#+curl 'https://api.github.com/repos/arachnist/mastodon/pulls/1/files?per_page=100' | jq -c 'map(select(has("patch")|not) | {name:.filename,url:.raw_url}) | .[]' | while read json; do + # kinda hacky? seems to work fine though :3 echo -e "# autogenerated file\n{fetchpatch, fetchurl}: {\n patches = [" > emoji.nix -curl 'https://api.github.com/repos/arachnist/mastodon/pulls/1/commits' | jq -r 'map(.sha) | .[]' | while read sha; do - url="https://github.com/arachnist/mastodon/pull/1/commits/$sha.patch" +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 =\n "'$url'";\n hash = "'$hash'";\n })' >> emoji.nix done echo -e ' ];\n files = [' >> emoji.nix -curl 'https://api.github.com/repos/arachnist/mastodon/pulls/1/files?per_page=100' | jq -c 'map(select(has("patch")|not) | {name:.filename,url:.raw_url}) | .[]' | while read json; do +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")"