update mastodon

This commit is contained in:
Vivian 2022-12-11 11:55:49 +01:00
parent e8cf6ad165
commit 05f6c9cba2
7 changed files with 126 additions and 80 deletions

View file

@ -399,11 +399,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1670598058,
"narHash": "sha256-zMK3VZWTYKJHCA0bl8Xg0AFX5rnhDR18VCtS28Ur3tY=",
"lastModified": 1670709556,
"narHash": "sha256-ws/Nfl0v0z4mqbaZcKeWY0jNq3O14vthVmAK2f12TfY=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "b9812f8bc0f372875af8c332e4537fdbf2b99c23",
"rev": "6381b6474fb6973bfe83526e21bcee08e5e45ecc",
"type": "github"
},
"original": {
@ -711,11 +711,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1670507980,
"narHash": "sha256-riNZa0xzM1it3pzxciwALeMs+0CsBMWIW2FqulzK8vM=",
"lastModified": 1670597555,
"narHash": "sha256-/k939P2S2246G6K5fyvC0U2IWvULhb4ZJg9K7ZxsX+k=",
"owner": "NULLx76",
"repo": "nixpkgs",
"rev": "2787fc7d1e51404678614bf0fe92fc296746eec0",
"rev": "2dea0f4c2d6e4603f54b2c56c22367e77869490c",
"type": "github"
},
"original": {
@ -796,11 +796,11 @@
},
"nur": {
"locked": {
"lastModified": 1670560288,
"narHash": "sha256-3TylYeaVeNkuIcyvdwCy/D1k723CDRqUgViRZCAdsGw=",
"lastModified": 1670733021,
"narHash": "sha256-HQwU8r6hVM2fvI2i7yNP5/lISs+V5XrxtUiMLkCeuAM=",
"owner": "nix-community",
"repo": "NUR",
"rev": "557e831973c5c9ce04e548e0672cad6ead61bbdd",
"rev": "a7194d7569f7cb5a63d34d205cdd8fa2f3225537",
"type": "github"
},
"original": {

View file

@ -9,7 +9,6 @@
nixpkgs.url = "github:NULLx76/nixpkgs/0x76";
nur.url = "github:nix-community/NUR";
nur.inputs.nixpkgs.follows = "nixpkgs";
colmena.url = "github:zhaofengli/colmena";
colmena.inputs.nixpkgs.follows = "nixpkgs";

View file

@ -112,6 +112,8 @@ in {
"nix.enableLanguageServer" = true; # Enable LSP.
"nix.serverPath" = "${pkgs.nil}/bin/nil";
"[nix]" = { "editor.defaultFormatter" = "brettm12345.nixfmt-vscode"; };
"rust-analyzer.checkOnSave.command" = "clippy";
"debug.allowBreakpointsEverywhere" = true;
# Don't index unecessary things
"files.exclude" = {
"**/.vscode" = true;
@ -147,6 +149,7 @@ in {
tamasfe.even-better-toml
valentjn.vscode-ltex
vscodevim.vim
vadimcn.vscode-lldb
xaver.clang-format
];
};

View file

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
sha256 = "sha256-ON4hJrj3YIxSE5PJ3ZVLdMC37f8wpf2Olej8M/Bjcks=";
sha256 = "sha256-XEREXrpHo4lwjx/wmDYWgNuHISr1KK1pzG0gTWmD4FI=";
};
nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodon-gems mastodon-gems.wrappedRuby ];

View file

@ -250,10 +250,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vqb2bfq5db7x66f4n4z30c953y5q8pwwl2067nxhz6j0c486pzm";
sha256 = "0wk2yb843p59hsccbyxdq820sd9i5gnqlcmk5fsjkfa7gsi1pkx9";
type = "gem";
};
version = "1.587.0";
version = "1.670.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@ -261,10 +261,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan";
sha256 = "0i5qw30vy950f5cm18a9cswa2810whpablp8x80sb9anx8k7h411";
type = "gem";
};
version = "3.130.2";
version = "3.168.2";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -272,10 +272,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3";
sha256 = "00f3rgidlayqsa5ml1vrzn346a3mprg61hfhln67lsbnkgn7nq54";
type = "gem";
};
version = "1.56.0";
version = "1.60.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@ -283,10 +283,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf";
sha256 = "1xpb8c8zw1c0grbw1rcc0ynlys1301vm9kkqy4ls3i2zqk5v6n91";
type = "gem";
};
version = "1.114.0";
version = "1.117.2";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@ -294,10 +294,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z";
sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m";
type = "gem";
};
version = "1.5.0";
version = "1.5.2";
};
bcrypt = {
groups = ["default" "pam_authentication"];
@ -369,20 +369,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0y1ycmvyd7swp6gy85m7znwilvb61zzcx6najgq0d1glq0p2hwy6";
sha256 = "1ln89f9ypzincd5hqgmzd5vvfgf7fgir56v1spsri40ma88vnipj";
type = "gem";
};
version = "1.13.0";
version = "1.15.0";
};
brakeman = {
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zr2p0w4ckv65cv3vdwnk9f3yydmjdmw75x7dskx1gqr9j9q3306";
sha256 = "0lcxxlrzgpi9z2mr2v19xda6fdysmn5psa9bsp2rksa915v91fds";
type = "gem";
};
version = "5.3.1";
version = "5.4.0";
};
browser = {
groups = ["default"];
@ -421,10 +421,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06rmq3s8q6xndxxl7qid9nf3hiaahs71jyiyyk3bx31hns1vkcci";
sha256 = "1f2phbpsiw8zwmmb1h6s82c4s2banzd04ch7vn6pdz91map233l1";
type = "gem";
};
version = "7.0.3";
version = "7.0.4";
};
bundler-audit = {
dependencies = ["thor"];
@ -508,10 +508,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05df76mfhfab6d7ir0qy5xf1ad6kqdh2p6vfqv7nhlx45k1y4ysg";
sha256 = "123198zk2ak8mziwa5jc3ckgpmsg08zn064n3aywnqm9s1bwjv3v";
type = "gem";
};
version = "3.37.1";
version = "3.38.0";
};
case_transform = {
dependencies = ["activesupport"];
@ -663,10 +663,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw";
sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b";
type = "gem";
};
version = "1.7.1";
version = "1.12.0";
};
debug_inspector = {
groups = ["default" "development"];
@ -759,10 +759,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1znfhqxvfdvxh0z8qnh1n7iahk9hs8d243j5dvig2v933j4z3ykw";
sha256 = "1lyn5fqh5d75p3wcwl1wgg2777wl3wyqfgq0d8bdf0169sha3ghc";
type = "gem";
};
version = "5.6.0";
version = "5.6.2";
};
dotenv = {
groups = ["default"];
@ -895,10 +895,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wslw5gh335zcahxmdd497xaa7h0d8l60c0jfv942mn47fxy8m47";
sha256 = "0fcrgzjvqc9fxhnn7mzvzxd41m63cil7n19mjxnisx836p0k93hl";
type = "gem";
};
version = "2.23.0";
version = "3.0.0";
};
faraday = {
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
@ -1291,10 +1291,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mi38zgpwvasjq0cqz674crwal5rsaw8f89bww9zsw2vk77bhaq9";
sha256 = "0zjsgrlvwpqsnrza4ijlxjld4550c661sgbqp2j2wp638nlnls1a";
type = "gem";
};
version = "1.6.0";
version = "1.6.2";
};
i18n = {
dependencies = ["concurrent-ruby"];
@ -1323,10 +1323,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xjr8nxpq6vsa4kd7pvd14xxiba9y4dais1yyz4dj567hsqdrhcm";
sha256 = "0dy04jx3n1ddz744b80mg7hp87miysnjp0h21lqr43hpmhdglxih";
type = "gem";
};
version = "0.1.4";
version = "0.1.5";
};
ipaddress = {
groups = ["default"];
@ -1343,10 +1343,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";
sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393";
type = "gem";
};
version = "1.6.1";
version = "1.6.2";
};
json = {
groups = ["default" "test"];
@ -1396,10 +1396,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h0pfxyrsbifzhwfxj1ppaxbk7v2z8mw53a0mi49i986wyspxlgv";
sha256 = "004s52m37b2kbw8dv4rdfm2d90h1023z1mw9zfcs0x87v8aq7zyn";
type = "gem";
};
version = "3.2.0";
version = "3.2.2";
};
jsonapi-renderer = {
groups = ["default"];
@ -1609,10 +1609,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s8qaf19yr4lhvdxk3cy3ifc47cgxdz2jybg6hzxsy9gh88c1f7v";
sha256 = "1c81d68r4wx0ckbmqxlfqc2qpd94jwcmqdm0xgr0s46r48pv9k9q";
type = "gem";
};
version = "1.0.0";
version = "1.0.1";
};
method_source = {
groups = ["default" "development" "pam_authentication" "production" "test"];
@ -1691,10 +1691,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02af38s49111wglqzcjcpa7bwg6psjgysrjvgk05h3x4zchb6gd5";
sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3";
type = "gem";
};
version = "1.5.4";
version = "1.6.0";
};
multi_json = {
groups = ["default"];
@ -1726,6 +1726,17 @@
};
version = "0.17.1";
};
net-protocol = {
dependencies = ["timeout"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "051cc82dl41a66c9sxv4lx4slqk7sz1v4iy0hdk6gpjyjszf4hxd";
type = "gem";
};
version = "0.1.3";
};
net-scp = {
dependencies = ["net-ssh"];
groups = ["default" "development"];
@ -1737,6 +1748,17 @@
};
version = "4.0.0.rc1";
};
net-smtp = {
dependencies = ["net-protocol"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x";
type = "gem";
};
version = "0.3.3";
};
net-ssh = {
groups = ["default" "development"];
platforms = [];
@ -1763,10 +1785,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr";
sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk";
type = "gem";
};
version = "1.13.8";
version = "1.13.10";
};
nsa = {
dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"];
@ -1784,10 +1806,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ihfnl0maszdq821h6mivr8xickjab6ccyncnm5rn2vgrj6imwxf";
sha256 = "0lggrhlihxyfgiqqr9b2fqdxc4d2zff2czq30m3rgn8a0b2gsv90";
type = "gem";
};
version = "3.13.21";
version = "3.13.23";
};
omniauth = {
dependencies = ["hashie" "rack"];
@ -1932,10 +1954,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb";
sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1";
type = "gem";
};
version = "1.4.3";
version = "1.4.5";
};
pghero = {
dependencies = ["activerecord"];
@ -1953,10 +1975,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0v9vmkmpha34lwdhig08kb7z4wk3xmw49dvkl99nz9llxhzqr5hl";
sha256 = "02fw2pzrmvwp67nbndpy8a2ln74fd8kmsiffw77z7g1mp58ww651";
type = "gem";
};
version = "1.4.9";
version = "1.5.1";
};
posix-spawn = {
groups = ["default"];
@ -1974,21 +1996,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f0zz3vwv1kyr43chvrpvhb8wm9qgcaz8ckc1lj2jxfp6xsss971";
sha256 = "0dfknfwwlzmb594acgi6v080ngxbnhshn3gzvdh5x2vx1aqvwc5r";
type = "gem";
};
version = "1.14.2";
version = "1.18.0";
};
premailer-rails = {
dependencies = ["actionmailer" "premailer"];
dependencies = ["actionmailer" "net-smtp" "premailer"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0q23clzqgzxcg1jld7hn5jy2yqxvana3iw66vmjgzz7y4ylf97b6";
sha256 = "0004f73kgrglida336fqkgx906m6n05nnfc17mypzg5rc78iaf61";
type = "gem";
};
version = "1.11.1";
version = "1.12.0";
};
private_address_check = {
groups = ["production" "test"];
@ -2080,10 +2102,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8";
type = "gem";
};
version = "1.6.0";
version = "1.6.1";
};
rack = {
groups = ["default" "development" "pam_authentication" "production" "test"];
@ -2264,10 +2286,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ysa8v2xw0ln4kdwhkg6mh71v5wbancsz5cf945kbk47m1ybn271";
sha256 = "1dngmsk9wg1vws56pl87dys0ns4bcn9arf8ip6zxa0gypr3ifq3m";
type = "gem";
};
version = "0.5.0";
version = "0.5.1";
};
redcarpet = {
groups = ["default"];
@ -2300,15 +2322,26 @@
};
version = "1.9.0";
};
redlock = {
dependencies = ["redis"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xvjwfzq7rqj4k311kidwmv5app3i7glz4miys6ixqy6c8yylz3c";
type = "gem";
};
version = "1.3.2";
};
regexp_parser = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0";
sha256 = "0mm5sykyblc61a82zz3dag6yy3mvflj2z47060kjzjj5793blqzi";
type = "gem";
};
version = "2.5.0";
version = "2.6.0";
};
request_store = {
dependencies = ["rack"];
@ -2583,10 +2616,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0p2mj2jj5b9wqmpvkngx87lfr2qgwhqvwx38bmhl5aa29pc6z5kx";
sha256 = "1z2fx4fzgnw4rzj3h1h4sk6qbkp7p2rdr58b2spxgkcsdzg0i5hh";
type = "gem";
};
version = "6.5.7";
version = "6.5.8";
};
sidekiq-bulk = {
dependencies = ["sidekiq"];
@ -2722,10 +2755,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0v7nk5i3fa63h6clfr5vbr0y91v3kxkaxh6gbdx583pn982avdlc";
sha256 = "02r3a3ny27ljj19bzmxscw2vlmk7sw1p4ppbl2i69g17khi0p4sw";
type = "gem";
};
version = "0.2.22";
version = "0.2.23";
};
statsd-ruby = {
groups = ["default"];
@ -2738,14 +2771,15 @@
version = "1.5.0";
};
stoplight = {
dependencies = ["redlock"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1628qf2ynldqz20h5lkaivk166qknk15gxg130n9pvz568k1sdp8";
sha256 = "0rmhhqvvrn7874r9cjf4wpv36vnxvxsrgb1kfgdk3dalg4rig7q6";
type = "gem";
};
version = "3.0.0";
version = "3.0.1";
};
strong_migrations = {
dependencies = ["activerecord"];
@ -2821,6 +2855,16 @@
};
version = "2.0.11";
};
timeout = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00cy93b6803j3aw5nail4l0zdrj54i5n2dlk6j9z998swcjbv3b2";
type = "gem";
};
version = "0.3.0";
};
tpm-key_attestation = {
dependencies = ["bindata" "openssl" "openssl-signature_algorithm"];
groups = ["default"];
@ -2912,10 +2956,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lslg5vvhx6w0mkbf6gpqvr9h8pj84wc639vk7ix7bqk61wgfch9";
sha256 = "0drm9pygji01pyimxq65ngdvgpn228g7fhffmrqw0xn7l2rdhclp";
type = "gem";
};
version = "1.2022.4";
version = "1.2022.7";
};
unf = {
dependencies = ["unf_ext"];
@ -3105,10 +3149,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc";
sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv";
type = "gem";
};
version = "2.6.0";
version = "2.6.6";
};
}

View file

@ -1,9 +1,9 @@
# This file was generated by pkgs.mastodon.updateScript.
{ fetchgit, applyPatches }: let
src = fetchgit {
url = "https://git.0x76.dev/v/mastodon.git";
rev = "6df9d388e7cb3d90a6d1fb0a920c1ce16db60822";
sha256 = "1ah34pc6v4qkld16393wzid8l0pyc81w2lzh1hk9r3anncpp86dr";
url = "https://github.com/glitch-soc/mastodon.git";
rev = "5d95e6debb496bb4ebba91afc043219c116d3ca2";
sha256 = "0z62xnr14gmrmbaaqsx7gmw322vj5rjbrmr8q7vl0z4lgmdva6qn";
};
in applyPatches {
inherit src;

View file

@ -1 +1 @@
"4.0.0rc3"
"4.0.2"