From b0a3cb40a44f7f2a802a4df8c68594bc99eca94f Mon Sep 17 00:00:00 2001 From: victor Date: Fri, 14 Oct 2022 21:09:46 +0200 Subject: [PATCH] update mastodon --- flake.nix | 2 +- nixos/pkgs/glitch-soc/default.nix | 2 +- nixos/pkgs/glitch-soc/gemset.nix | 125 ++++++++++++++---------------- nixos/pkgs/glitch-soc/source.nix | 6 +- 4 files changed, 63 insertions(+), 72 deletions(-) diff --git a/flake.nix b/flake.nix index 67ef74b..f422d27 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; hyprland.url = "github:hyprwm/Hyprland"; - hyprpaper.url = "github:NULLx76/hyprpaper"; + hyprpaper.url = "github:hyprwm/hyprpaper"; hyprpaper.inputs.nixpkgs.follows = "nixpkgs"; riff.url = "github:DeterminateSystems/riff"; diff --git a/nixos/pkgs/glitch-soc/default.nix b/nixos/pkgs/glitch-soc/default.nix index 1f48ccc..9ec3cfb 100644 --- a/nixos/pkgs/glitch-soc/default.nix +++ b/nixos/pkgs/glitch-soc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - sha256 = "sha256-b0XNhcCcTtYEdy1ZzRGwOrLpgpsMlt9qLf5CBa+1BL8="; + sha256 = "sha256-Yt7TIH24B+S8JarcCEIyMAKWlFiXlb/5i7p2cBrZlDM="; }; mastodon-gems = bundlerEnv { diff --git a/nixos/pkgs/glitch-soc/gemset.nix b/nixos/pkgs/glitch-soc/gemset.nix index c0c5f1a..fb54623 100644 --- a/nixos/pkgs/glitch-soc/gemset.nix +++ b/nixos/pkgs/glitch-soc/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p8zkh5ww16y8n1jp12y1gjrmll7m7305c91p419f10qrw4x8cgc"; + sha256 = "0r7ybdykxnn2544vcjmi51mxfpfqx3b4c7fjz15c57hamkhlalzf"; type = "gem"; }; - version = "6.1.6"; + version = "6.1.7"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z52r7k3ig09zjvfcb8xnrl9vl0ssii22c2h7gx26nq8wb7yjkwq"; + sha256 = "024a1c2ak1znkvys7pjkkan23wc0vhzyprl16gp9xcr4wy0l6dn4"; type = "gem"; }; - version = "6.1.6"; + version = "6.1.7"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "186bkhrp8j81nrw5xznbi0nyhk49gdv6ynd80pcyk5lxhfkiw1wc"; + sha256 = "193gj013bx5axd4nwvlf6mq19rcvymkf72q9f7ml6v9yl6cc4qam"; type = "gem"; }; - version = "6.1.6"; + version = "6.1.7"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1walbq04v4qvgnz39cbfhz9bzhsf14q1h7gd0kgjy3frld6ysrhb"; + sha256 = "0dygq5fxbrgynd2g7r51asyrap1d6cxravwh509kfmqpfbiq119s"; type = "gem"; }; - version = "6.1.6"; + version = "6.1.7"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s6v0vnnm8zrxc3pr058r8bvgs6fxgjhadbc5r1sv1mrbyvvm1h0"; + sha256 = "13kr77v91wa7sfsq7h04g8zy1qxcbwhhf4k6zz8276b1d10szly5"; type = "gem"; }; - version = "6.1.6"; + version = "6.1.7"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r0h7pvc0szqmgnra0j3j8ap7dmiyw9s6qksx41v5cxknmfi0h3"; + sha256 = "1m68my4dnj7q7986jwlb7gir0f7hahdsqbiaxfvgngwksa8fhrn1"; type = "gem"; }; - version = "6.1.6"; + version = "6.1.7"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -92,10 +92,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gjvxrzdbg0dsyqx7wsmxqfvlpl37zvzq3d1cylhb5qslsw6ml05"; + sha256 = "05f497khf51wrsah927pnmpl0yrcx82gajjk8brcrrbbbd9arlp5"; type = "gem"; }; - version = "6.1.6"; + version = "6.1.7"; }; activemodel = { dependencies = ["activesupport"]; @@ -103,10 +103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f0ai51icvvx5q0jd1l89k0dlwzpsrkqlj6x43f8qc4bd1ya9glx"; + sha256 = "183d7laxvwrw1d02qgm8rg9ljjihfiyh4vzi58xm42z3fr3bbhky"; type = "gem"; }; - version = "6.1.6"; + version = "6.1.7"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0khjnkvmiyap1g3rvw9hp16mzai4smqcg5hxhq28pll25ljzxdbp"; + sha256 = "1dsxi813wyhx2d0bbyc0nla4ck6nmmi3z3765gdqf6xl3dha5r2j"; type = "gem"; }; - version = "6.1.6"; + version = "6.1.7"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -125,10 +125,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03w600j4jzgfycy2xm6cxry3q5rpvx1jvr7msy1jx65sa2shgjha"; + sha256 = "1yvmvfka2s7am8m3zdllblxiyyy4yr3ca6q6q5r23fd2qs7rmbz0"; type = "gem"; }; - version = "6.1.6"; + version = "6.1.7"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -136,10 +136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08wzpwgdm03vzb8gqr8bvfdarb89g5ah0skvwqk6qv87p55xqkyw"; + sha256 = "0k5pq2swzgddmwwr6x1phbspk1vw8cl88ci8jbi18mrirjjfippr"; type = "gem"; }; - version = "6.1.6"; + version = "6.1.7"; }; addressable = { dependencies = ["public_suffix"]; @@ -321,15 +321,15 @@ version = "2.9.1"; }; better_html = { - dependencies = ["actionview" "activesupport" "ast" "erubi" "html_tokenizer" "parser" "smart_properties"]; + dependencies = ["actionview" "activesupport" "ast" "erubi" "parser" "smart_properties"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sssv94gg7bnxiqn5pbbpf8rdnmw3iyj2qwn2pbgxxs8xmmq158b"; + sha256 = "1y090dmgjxr3yzxi3pg5jgirkmyfdrmjhabmzmhg5i8ssiqr2gdz"; type = "gem"; }; - version = "1.0.16"; + version = "2.0.1"; }; bindata = { groups = ["default"]; @@ -620,10 +620,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ffdxhgirgc86qb42yvmfj6v1v0x4lvi0pxn9zhghkff44wzra0k"; + sha256 = "1nj4r58m5cpfdsijj6gjfs3yzcnxq2halagjk07wjcrgj6z8ayb7"; type = "gem"; }; - version = "2.2.5"; + version = "2.3.0"; }; cose = { dependencies = ["cbor" "openssl-signature_algorithm"]; @@ -759,10 +759,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188ybg2cgghcp5r1jpfnbx3anf0z8fzlla72jra0vgwkdylk7qkz"; + sha256 = "1znfhqxvfdvxh0z8qnh1n7iahk9hs8d243j5dvig2v933j4z3ykw"; type = "gem"; }; - version = "5.5.4"; + version = "5.6.0"; }; dotenv = { groups = ["default"]; @@ -853,10 +853,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; + sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; et-orbi = { dependencies = ["tzinfo"]; @@ -895,10 +895,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1na8p9r9zdvz75aihjczhamlygrjs9dj7pcbxgg8vfavrx8d89b5"; + sha256 = "1wslw5gh335zcahxmdd497xaa7h0d8l60c0jfv942mn47fxy8m47"; type = "gem"; }; - version = "2.22.0"; + version = "2.23.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"]; @@ -1223,16 +1223,6 @@ }; version = "0.3.0"; }; - html_tokenizer = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dq6685sdzdn53mkzags6mvx3l0afcx6xma664zij6y3dxj2a7p8"; - type = "gem"; - }; - version = "0.0.7"; - }; htmlentities = { groups = ["default"]; platforms = []; @@ -1301,10 +1291,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dr7cj8km01kjsiwrx7n3qxr264ga13ll15s4h9dbbyj5m8kxqd2"; + sha256 = "0mi38zgpwvasjq0cqz674crwal5rsaw8f89bww9zsw2vk77bhaq9"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -1323,10 +1313,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ahckdzg7k464pv1lxdcmxf51wlf480d5y2fvmz2dkcn39p7477b"; + sha256 = "19zkcsqwzc3i6vizj26mxxww6m5grv9zmp6yxyswbqq9kyzb081z"; type = "gem"; }; - version = "1.0.11"; + version = "1.0.12"; }; idn-ruby = { groups = ["default"]; @@ -1556,10 +1546,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; + sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; type = "gem"; }; - version = "2.18.0"; + version = "2.19.0"; }; mail = { dependencies = ["mini_mime"]; @@ -1691,10 +1681,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; + sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; type = "gem"; }; - version = "5.16.2"; + version = "5.16.3"; }; msgpack = { groups = ["default"]; @@ -1911,10 +1901,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d"; + sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; type = "gem"; }; - version = "3.1.2.0"; + version = "3.1.2.1"; }; parslet = { groups = ["default"]; @@ -2166,10 +2156,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06wzq30c2f9jhsbkxwg9n18xwyh66fnpbndkrvq1c4mrl2rx478z"; + sha256 = "01l06196jkidj07g8jdc43nr060r46hsjz8bk4bdk0lzzck94fvf"; type = "gem"; }; - version = "6.1.6"; + version = "6.1.7"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2232,10 +2222,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16dyjmy42v51acmx1ba2xxncvx368ss5rww6bsf1lwgyk4vqn41h"; + sha256 = "1iwziqrzk7f7r3w5pkfnbh1mqsfsywy7lvz2blqds3nval79dw2x"; type = "gem"; }; - version = "6.1.6"; + version = "6.1.7"; }; rainbow = { groups = ["default" "development" "test"]; @@ -2453,10 +2443,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xfk4pla77251n39zf4n792m1rhg5sn1kp63yvpvvysany34la03"; + sha256 = "1c01iicvrjk6vv744jgh0y4kk9d0kg2rd2ihdyzvg5p06xm2fpzq"; type = "gem"; }; - version = "3.11.0"; + version = "3.11.1"; }; rspec_junit_formatter = { dependencies = ["rspec-core"]; @@ -2464,10 +2454,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jqh5v1kjisncfzf9z0hghkaiqab086rcgy21cy3djg828sm1bxk"; + sha256 = "059bnq1gcwl9g93cqf13zpz38zk7jxaa43anzz06qkmfwrsfdpa0"; type = "gem"; }; - version = "0.5.1"; + version = "0.6.0"; }; rubocop = { dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -2593,10 +2583,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6sskq3ivpll14jqbmp09bkrz64i08j9dg8m2a7p5akkzklwiil"; + sha256 = "0p2mj2jj5b9wqmpvkngx87lfr2qgwhqvwx38bmhl5aa29pc6z5kx"; type = "gem"; }; - version = "6.5.5"; + version = "6.5.7"; }; sidekiq-bulk = { dependencies = ["sidekiq"]; @@ -2922,10 +2912,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k62nrh30sinsfbs17w8cahydf3vm3j14l0l0ba78vfh429cv4i3"; + sha256 = "1lslg5vvhx6w0mkbf6gpqvr9h8pj84wc639vk7ix7bqk61wgfch9"; type = "gem"; }; - version = "1.2022.3"; + version = "1.2022.4"; }; unf = { dependencies = ["unf_ext"]; @@ -2953,10 +2943,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn"; + sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7"; type = "gem"; }; - version = "2.1.0"; + version = "2.3.0"; }; uniform_notifier = { groups = ["default" "development"]; @@ -3121,3 +3111,4 @@ version = "2.6.0"; }; } + diff --git a/nixos/pkgs/glitch-soc/source.nix b/nixos/pkgs/glitch-soc/source.nix index fcd2ac8..00e284c 100644 --- a/nixos/pkgs/glitch-soc/source.nix +++ b/nixos/pkgs/glitch-soc/source.nix @@ -1,9 +1,9 @@ # This file was generated by pkgs.mastodon.updateScript. { fetchgit, applyPatches }: let src = fetchgit { - url = "https://github.com/NULLx76/glitch-soc.git"; - rev = "475fbad464ec97dcb639d37cb53168cc59327b86"; - sha256 = "0f226mr7y3qn1pw2na1qvs4g067474626fxm3wh96yw15gqjw2gj"; + url = "https://github.com/glitch-soc/mastodon.git"; + rev = "7e62688a0e656d71b0358fa55d5f6e8f8103c297"; + sha256 = "0hz2p1vjalvrz3va6f0vdmmpi0iaw628giiwdpyyf7x0f95yzqyp"; }; in applyPatches { inherit src;