From 61bbde7bebdddcf32420e3252f1b87f8eb85aa13 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 24 Aug 2021 09:54:57 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 18 ++-- modules/programs/hledger/default.nix | 2 +- modules/services/accentor/Gemfile | 4 +- modules/services/accentor/Gemfile.lock | 136 ++++++++++++------------- modules/services/accentor/default.nix | 4 +- modules/services/accentor/gemset.nix | 96 ++++++++--------- modules/services/accentor/package.json | 10 +- modules/services/accentor/yarn.lock | 32 +++--- modules/services/accentor/yarn.nix | 34 +++---- patches/135080.patch | 29 ------ 10 files changed, 168 insertions(+), 197 deletions(-) delete mode 100644 patches/135080.patch diff --git a/flake.lock b/flake.lock index ada6ee75..c16f139d 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1629711003, - "narHash": "sha256-e/s0jjRCeivmftZtg4jRdCNMDf4lpgnXjuMH3ybcGWU=", + "lastModified": 1629766736, + "narHash": "sha256-Id+RnL1yNzG4vtM55mwEr6pTXUdpWFjknvkaQ/LP7tI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6f051c9a25ebae34cf05a7c6b800d2c67c08525e", + "rev": "81b96e496b7098297fe4e980dfd975c9d4a358ac", "type": "github" }, "original": { @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1629598480, - "narHash": "sha256-d07nc5Kf2MMKKVe47iIrBT+14/65g2nhEn+Z4PKjFmk=", + "lastModified": 1629729582, + "narHash": "sha256-P8bSE0v/alIafhsDVPwIZyBMz4YfHc2H0mOabnsf1so=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6d1cad6ba228b81bf7045f1124aa99dfdcf3daa", + "rev": "9029fd2b9de2147480efab55f351343f4fed73b9", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1629292755, - "narHash": "sha256-5xMo32NVLnloY9DveqwJO/Cab1+PbTMPqU4WMmawX5M=", + "lastModified": 1629618782, + "narHash": "sha256-2K8SSXu3alo/URI3MClGdDSns6Gb4ZaW4LET53UWyKk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "253aecf69ed7595aaefabde779aa6449195bebb7", + "rev": "870959c7fb3a42af1863bed9e1756086a74eb649", "type": "github" }, "original": { diff --git a/modules/programs/hledger/default.nix b/modules/programs/hledger/default.nix index 93aba5db..7ee9e84e 100644 --- a/modules/programs/hledger/default.nix +++ b/modules/programs/hledger/default.nix @@ -5,7 +5,7 @@ let owner = "simonmichael"; repo = "hledger"; rev = "master"; - sha256 = "FrbRLjsuunAVXYGJdLEKlCpNjcwvNE96Ta28mKe0dtQ="; + sha256 = "5iDNRTMFehvUEc2Zeg7UWe+l9rdTdRoEO2xg6Q8Lmio="; }; in { diff --git a/modules/services/accentor/Gemfile b/modules/services/accentor/Gemfile index 7d114c00..966ff8de 100644 --- a/modules/services/accentor/Gemfile +++ b/modules/services/accentor/Gemfile @@ -36,7 +36,7 @@ gem 'bootsnap', '>= 1.4.6', require: false gem 'rack-cors', '~> 1.1' group :test do - gem 'codecov', '~> 0.5.2', require: false + gem 'codecov', '~> 0.6.0', require: false gem 'mocha', '~> 1.13.0', require: false gem 'simplecov', '~> 0.21', require: false end @@ -54,7 +54,7 @@ group :development do gem 'rubocop-minitest', '~> 0.15.0' gem 'rubocop-rails', '~> 2.11' - gem 'listen', '>= 3.1.5', '< 3.7' + gem 'listen', '>= 3.1.5', '< 3.8' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring', '~> 2.1' gem 'spring-watcher-listen', '~> 2.0' diff --git a/modules/services/accentor/Gemfile.lock b/modules/services/accentor/Gemfile.lock index 72934b08..27c0f7d7 100644 --- a/modules/services/accentor/Gemfile.lock +++ b/modules/services/accentor/Gemfile.lock @@ -1,40 +1,40 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.4) - actionpack (= 6.1.4) - activesupport (= 6.1.4) + actioncable (6.1.4.1) + actionpack (= 6.1.4.1) + activesupport (= 6.1.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.4) - actionpack (= 6.1.4) - activejob (= 6.1.4) - activerecord (= 6.1.4) - activestorage (= 6.1.4) - activesupport (= 6.1.4) + actionmailbox (6.1.4.1) + actionpack (= 6.1.4.1) + activejob (= 6.1.4.1) + activerecord (= 6.1.4.1) + activestorage (= 6.1.4.1) + activesupport (= 6.1.4.1) mail (>= 2.7.1) - actionmailer (6.1.4) - actionpack (= 6.1.4) - actionview (= 6.1.4) - activejob (= 6.1.4) - activesupport (= 6.1.4) + actionmailer (6.1.4.1) + actionpack (= 6.1.4.1) + actionview (= 6.1.4.1) + activejob (= 6.1.4.1) + activesupport (= 6.1.4.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.4) - actionview (= 6.1.4) - activesupport (= 6.1.4) + actionpack (6.1.4.1) + actionview (= 6.1.4.1) + activesupport (= 6.1.4.1) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.4) - actionpack (= 6.1.4) - activerecord (= 6.1.4) - activestorage (= 6.1.4) - activesupport (= 6.1.4) + actiontext (6.1.4.1) + actionpack (= 6.1.4.1) + activerecord (= 6.1.4.1) + activestorage (= 6.1.4.1) + activesupport (= 6.1.4.1) nokogiri (>= 1.8.5) - actionview (6.1.4) - activesupport (= 6.1.4) + actionview (6.1.4.1) + activesupport (= 6.1.4.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -44,22 +44,22 @@ GEM activemodel (>= 4.1, < 6.2) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (6.1.4) - activesupport (= 6.1.4) + activejob (6.1.4.1) + activesupport (= 6.1.4.1) globalid (>= 0.3.6) - activemodel (6.1.4) - activesupport (= 6.1.4) - activerecord (6.1.4) - activemodel (= 6.1.4) - activesupport (= 6.1.4) - activestorage (6.1.4) - actionpack (= 6.1.4) - activejob (= 6.1.4) - activerecord (= 6.1.4) - activesupport (= 6.1.4) + activemodel (6.1.4.1) + activesupport (= 6.1.4.1) + activerecord (6.1.4.1) + activemodel (= 6.1.4.1) + activesupport (= 6.1.4.1) + activestorage (6.1.4.1) + actionpack (= 6.1.4.1) + activejob (= 6.1.4.1) + activerecord (= 6.1.4.1) + activesupport (= 6.1.4.1) marcel (~> 1.0.0) mini_mime (>= 1.1.0) - activesupport (6.1.4) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -76,7 +76,7 @@ GEM byebug (11.1.3) case_transform (0.2) activesupport - codecov (0.5.2) + codecov (0.6.0) simplecov (>= 0.15, < 0.22) concurrent-ruby (1.1.9) crass (1.0.6) @@ -87,7 +87,7 @@ GEM delayed_job_active_record (4.1.6) activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) - docile (1.3.5) + docile (1.4.0) erubi (1.10.0) factory_bot (6.2.0) activesupport (>= 5.0.0) @@ -97,8 +97,8 @@ GEM faker (2.18.0) i18n (>= 1.6, < 2) ffi (1.15.3) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (0.5.2) + activesupport (>= 5.0) has_scope (0.8.0) actionpack (>= 5.2) activesupport (>= 5.2) @@ -108,10 +108,10 @@ GEM mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) jsonapi-renderer (0.2.2) - listen (3.6.0) + listen (3.7.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.10.0) + loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -120,13 +120,13 @@ GEM method_source (1.0.0) mini_magick (4.11.0) mini_mime (1.1.0) - mini_portile2 (2.5.3) + mini_portile2 (2.6.1) minitest (5.14.4) mocha (1.13.0) msgpack (1.4.2) - nio4r (2.5.7) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + nio4r (2.5.8) + nokogiri (1.12.3) + mini_portile2 (~> 2.6.1) racc (~> 1.4) parallel (1.20.1) parser (3.0.2.0) @@ -142,34 +142,34 @@ GEM rack (>= 2.0.0) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.1.4) - actioncable (= 6.1.4) - actionmailbox (= 6.1.4) - actionmailer (= 6.1.4) - actionpack (= 6.1.4) - actiontext (= 6.1.4) - actionview (= 6.1.4) - activejob (= 6.1.4) - activemodel (= 6.1.4) - activerecord (= 6.1.4) - activestorage (= 6.1.4) - activesupport (= 6.1.4) + rails (6.1.4.1) + actioncable (= 6.1.4.1) + actionmailbox (= 6.1.4.1) + actionmailer (= 6.1.4.1) + actionpack (= 6.1.4.1) + actiontext (= 6.1.4.1) + actionview (= 6.1.4.1) + activejob (= 6.1.4.1) + activemodel (= 6.1.4.1) + activerecord (= 6.1.4.1) + activestorage (= 6.1.4.1) + activesupport (= 6.1.4.1) bundler (>= 1.15.0) - railties (= 6.1.4) + railties (= 6.1.4.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.1) loofah (~> 2.3) - railties (6.1.4) - actionpack (= 6.1.4) - activesupport (= 6.1.4) + railties (6.1.4.1) + actionpack (= 6.1.4.1) + activesupport (= 6.1.4.1) method_source rake (>= 0.13) thor (~> 1.0) rainbow (3.0.0) - rake (13.0.3) + rake (13.0.6) rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) @@ -200,7 +200,7 @@ GEM simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov_json_formatter (0.1.2) + simplecov_json_formatter (0.1.3) spring (2.1.1) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) @@ -232,14 +232,14 @@ DEPENDENCIES bcrypt (~> 3.1) bootsnap (>= 1.4.6) byebug - codecov (~> 0.5.2) + codecov (~> 0.6.0) delayed_cron_job (~> 0.7) delayed_job_active_record (~> 4.1) factory_bot_rails (~> 6.2) faker (~> 2.18) has_scope (~> 0.8) image_processing (~> 1.12.1) - listen (>= 3.1.5, < 3.7) + listen (>= 3.1.5, < 3.8) mocha (~> 1.13.0) pg (>= 1.2.3, < 2.0) puma (~> 5.4) diff --git a/modules/services/accentor/default.nix b/modules/services/accentor/default.nix index 0aa2f060..29242fb2 100644 --- a/modules/services/accentor/default.nix +++ b/modules/services/accentor/default.nix @@ -31,7 +31,7 @@ owner = "accentor"; repo = "api"; rev = "main"; - sha256 = "44G1y+bXBSqSaTdOObV/jcrOZBiynx7JYjrV3/Ae90Y="; + sha256 = "2KhHyGRaxTF14okQjagZV618MDlqB1LjeNIXRp4p//s="; }; }); webPackage = (pkgs.accentor-web.override { @@ -43,7 +43,7 @@ owner = "accentor"; repo = "web"; rev = "main"; - sha256 = "V6JAVA52frhHLupHlog1gXliuWrWLo+BVWZtpwlVjiM="; + sha256 = "K58VX0vCsjFn16uvGosbyI/XKXQp5VVA2haVMY2bkFw="; }; }); }; diff --git a/modules/services/accentor/gemset.nix b/modules/services/accentor/gemset.nix index fc8f2fa4..1a55c747 100644 --- a/modules/services/accentor/gemset.nix +++ b/modules/services/accentor/gemset.nix @@ -5,10 +5,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1wswkgwhmfk5j76ar76plhaxna12x0cyf2di57azahlcv88rrwra"; + sha256 = "0ilq5mniarm0zlvnkagqj9n9p73ljrhphciz02aymrpfxxxclz2x"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; actionmailbox = { dependencies = [ "actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" ]; @@ -16,10 +16,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "101r0x4lhzp23hksch7z24ajvp549lskxn2cr7pbgr64jjy6v17y"; + sha256 = "16azdnjws215clb056b9mabglx4b8f61hr82hv7hm80dmn89zqq6"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; actionmailer = { dependencies = [ "actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing" ]; @@ -27,10 +27,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mxqpiwgqam5vfk8wsfyj4dpxq0xqqvfbcwx1i4p9n1ahrx7wv7f"; + sha256 = "00s07l2ac5igch1g2rpa0linmiq7mhgk6v6wxkckg8gbiqijb592"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; actionpack = { dependencies = [ "actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer" ]; @@ -38,10 +38,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pj4xz316b3z56vpb8pnrkwj4rlf3hgas5fhddk6yh7ifrl30sc9"; + sha256 = "0xgysqnibjsy6kdz10x2xb3kwa6lssiqhh0zggrbgs31ypwhlpia"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; actiontext = { dependencies = [ "actionpack" "activerecord" "activestorage" "activesupport" "nokogiri" ]; @@ -49,10 +49,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fn488la8dllfg5zhm74k8y23xl9czrzzs55b9v624j43wjhfxcl"; + sha256 = "0m4fy4qqh09vnzbhx383vjdfid6fzbs49bzzg415x05nmmjkx582"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; actionview = { dependencies = [ "activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer" ]; @@ -60,10 +60,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jqybz7h11xkjpqdffb9gphwmd56lms9xqskza00wd2pswxcwkn4"; + sha256 = "1yf4ic5kl324rs0raralpwx24s6hvvdzxfhinafylf8f3x7jj23z"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; active_model_serializers = { dependencies = [ "actionpack" "activemodel" "case_transform" "jsonapi-renderer" ]; @@ -82,10 +82,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0q00vrknnnhmg02nik06ivrmz7hnq5snpy653kdpskvp4c9ys55c"; + sha256 = "1q7c0i0kwarxgcbxk71wa9jnlg45grbxmhlrh7dk9bgcv7r7r7hn"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; activemodel = { dependencies = [ "activesupport" ]; @@ -93,10 +93,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xjy8fg7n5wwv29ngvvdf5r6815s5f0knzyswxh8w6z8f8qj5wr7"; + sha256 = "16ixam4lni8b5lgx0whnax0imzh1dh10fy5r9pxs52n83yz5nbq3"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; activerecord = { dependencies = [ "activemodel" "activesupport" ]; @@ -104,10 +104,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18897s9h9kha8vgky1yfq4x91m3p81k6rkrb1fgjlnqnvarh9vg0"; + sha256 = "1ccgvlj767ybps3pxlaa4iw77n7wbriw2sr8754id3ngjfap08ja"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; activestorage = { dependencies = [ "actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime" ]; @@ -115,10 +115,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03gb6jbvdzm0xlr2g393jvf980ybjf9zzgspl0p4ixh3lcxxr51w"; + sha256 = "17knzz9fvqg4x582vy0xmlgjkxfb13xyzl2rgw19qfma86hxsvvi"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; activesupport = { dependencies = [ "concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk" ]; @@ -126,10 +126,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk"; + sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; annotate = { dependencies = [ "activerecord" "rake" ]; @@ -221,10 +221,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1svgz4469ph5jlnnwfrwrrfi8c05cnis4bib769pjjjy9ax4s3zh"; + sha256 = "1pi2dmqxjw5wsn65yx5qz5ks5msqflj0zxvk11r3cxwgacvj3hys"; type = "gem"; }; - version = "0.5.2"; + version = "0.6.0"; }; concurrent-ruby = { groups = [ "default" "development" "test" ]; @@ -284,10 +284,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bpdrsdqwv80qqc3f4xxzpii13lx9mlx3zay4bnmmscrx8c0p63z"; + sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; type = "gem"; }; - version = "1.3.5"; + version = "1.4.0"; }; erubi = { groups = [ "default" "development" "test" ]; @@ -348,10 +348,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1"; + sha256 = "0k6ww3shk3mv119xvr9m99l6ql0czq91xhd66hm8hqssb18r2lvm"; type = "gem"; }; - version = "0.4.2"; + version = "0.5.2"; }; has_scope = { dependencies = [ "actionpack" "activesupport" ]; @@ -402,10 +402,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1dq7yd4s9accpjiq0f92sgikw3whc5wnjn065laggkpqcqgx75gh"; + sha256 = "0ncfhdkjiwq9l1pm87ax2pa20kz2j0dz56vi74cnr5a6cfk0qb5p"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.0"; }; loofah = { dependencies = [ "crass" "nokogiri" ]; @@ -413,10 +413,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19vkaazjqyq7yj5ah8rpr4vl9n4mg95scdr5im93akhd5bjvkkly"; + sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw"; type = "gem"; }; - version = "2.10.0"; + version = "2.12.0"; }; mail = { dependencies = [ "mini_mime" ]; @@ -474,10 +474,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; + sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; type = "gem"; }; - version = "2.5.3"; + version = "2.6.1"; }; minitest = { groups = [ "default" "development" "test" ]; @@ -514,10 +514,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5"; + sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; type = "gem"; }; - version = "2.5.7"; + version = "2.5.8"; }; nokogiri = { dependencies = [ "mini_portile2" "racc" ]; @@ -525,10 +525,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; + sha256 = "1q71y7pdihz26m3n2fnm2hd7wllmnxgxk6vcbbh27rqa14q5x5yi"; type = "gem"; }; - version = "1.11.7"; + version = "1.12.3"; }; parallel = { groups = [ "default" "development" ]; @@ -631,10 +631,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0k3d3acac2qn9fg185z3y79nvg4ghr4lyhqiz6mbwlsd7r2nd8mh"; + sha256 = "1y59m2x8rdc581bjgyyr9dabi3vk3frqhhpbb5ldpbj622kxfpbz"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; rails-dom-testing = { dependencies = [ "activesupport" "nokogiri" ]; @@ -653,10 +653,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; + sha256 = "0whc4d4jqm8kd4x3jzbax54sscm1k4pfkr5d1gpapjbzqkfj77yy"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.1"; }; railties = { dependencies = [ "actionpack" "activesupport" "method_source" "rake" "thor" ]; @@ -664,10 +664,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0hwp0qwkphp3fvbsq6ljp8s99v621si9bgqihysz5bv1d1z52mm4"; + sha256 = "1kwpm068cqys34p2g0j3l1g0cd5f3kxnsay5v7lmbd0sgarac0vy"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; rainbow = { groups = [ "default" "development" ]; @@ -684,10 +684,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; type = "gem"; }; - version = "13.0.3"; + version = "13.0.6"; }; rb-fsevent = { groups = [ "default" "development" ]; @@ -821,10 +821,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cl3j7p3b5q7sxsx1va63c8imc5x6g99xablz08qrmqhpi0d6g6j"; + sha256 = "19r15hyvh52jx7fmsrcflb58xh8l7l0zx4sxkh3hqzhq68y81pjl"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; spring = { groups = [ "development" ]; diff --git a/modules/services/accentor/package.json b/modules/services/accentor/package.json index 39f3eada..63ca1fbf 100644 --- a/modules/services/accentor/package.json +++ b/modules/services/accentor/package.json @@ -1,6 +1,6 @@ { "name": "accentor", - "version": "0.24.1", + "version": "0.25.0", "private": true, "scripts": { "serve": "vue-cli-service serve", @@ -9,11 +9,11 @@ "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'" }, "dependencies": { - "@accentor/api-client-js": "^0.11.2", + "@accentor/api-client-js": "^0.12.1", "@mdi/font": "^5.9.55", "@mdi/svg": "^5.9.55", "fetch-retry": "^4.1.1", - "localforage": "^1.9.0", + "localforage": "^1.10.0", "lodash.debounce": "^4.0.8", "roboto-fontface": "^0.10.0", "vue": "^2.6.14", @@ -33,11 +33,11 @@ "@vue/eslint-config-prettier": "^6.0.0", "babel-eslint": "^10.1.0", "eslint": "^6.8.0", - "eslint-plugin-prettier": "^3.4.0", + "eslint-plugin-prettier": "^3.4.1", "eslint-plugin-vue": "^7.16.0", "eslint-plugin-vuetify": "^1.0.1", "prettier": "^2.3.2", - "sass": "^1.37.5", + "sass": "^1.38.0", "sass-loader": "^10.1.1", "vue-cli-plugin-i18n": "^2.1.3", "vue-cli-plugin-vuetify": "^2.4.2", diff --git a/modules/services/accentor/yarn.lock b/modules/services/accentor/yarn.lock index 8e6087ab..98e03d1a 100644 --- a/modules/services/accentor/yarn.lock +++ b/modules/services/accentor/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@accentor/api-client-js@^0.11.2": - version "0.11.2" - resolved "https://registry.yarnpkg.com/@accentor/api-client-js/-/api-client-js-0.11.2.tgz#1d606360cc03c50888025cede40339ece36ef5f0" - integrity sha512-uLluel1oRj+0+27wDcfAN1jGNkbWsr79T49YtV4PKOi6kjrJhWIoW8oR2sNrG4/OYy8xAg0978XTlyK/g55h7Q== +"@accentor/api-client-js@^0.12.1": + version "0.12.1" + resolved "https://registry.yarnpkg.com/@accentor/api-client-js/-/api-client-js-0.12.1.tgz#7b784cb7afe077b39e0a9e8d619cb8bf34ae8281" + integrity sha512-8b1XCiCKGAhoq7D3fmMQ48qdlW/zZp/98dHvO6fBXrOpJ/YQAeEQigRpmvc+GmYYTZo2JlJeT686fNMYPeE0QQ== dependencies: fetch-retry "^4.1.1" @@ -3472,10 +3472,10 @@ eslint-loader@^2.2.1: object-hash "^1.1.4" rimraf "^2.6.1" -eslint-plugin-prettier@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz#cdbad3bf1dbd2b177e9825737fe63b476a08f0c7" - integrity sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw== +eslint-plugin-prettier@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5" + integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g== dependencies: prettier-linter-helpers "^1.0.0" @@ -5280,10 +5280,10 @@ loader-utils@^2.0.0: emojis-list "^3.0.0" json5 "^2.1.2" -localforage@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.9.0.tgz#f3e4d32a8300b362b4634cc4e066d9d00d2f09d1" - integrity sha512-rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g== +localforage@^1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4" + integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg== dependencies: lie "3.1.1" @@ -7201,10 +7201,10 @@ sass-loader@^10.1.1: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.37.5: - version "1.37.5" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.37.5.tgz#f6838351f7cc814c4fcfe1d9a20e0cabbd1e7b3c" - integrity sha512-Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA== +sass@^1.38.0: + version "1.38.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.38.0.tgz#2f3e60a1efdcdc910586fa79dc89d3399a145b4f" + integrity sha512-WBccZeMigAGKoI+NgD7Adh0ab1HUq+6BmyBUEaGxtErbUtWUevEbdgo5EZiJQofLUGcKtlNaO2IdN73AHEua5g== dependencies: chokidar ">=3.0.0 <4.0.0" diff --git a/modules/services/accentor/yarn.nix b/modules/services/accentor/yarn.nix index f1c4c265..a9336f9c 100644 --- a/modules/services/accentor/yarn.nix +++ b/modules/services/accentor/yarn.nix @@ -1,12 +1,12 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { - name = "_accentor_api_client_js___api_client_js_0.11.2.tgz"; + name = "_accentor_api_client_js___api_client_js_0.12.1.tgz"; path = fetchurl { - name = "_accentor_api_client_js___api_client_js_0.11.2.tgz"; - url = "https://registry.yarnpkg.com/@accentor/api-client-js/-/api-client-js-0.11.2.tgz"; - sha1 = "1d606360cc03c50888025cede40339ece36ef5f0"; + name = "_accentor_api_client_js___api_client_js_0.12.1.tgz"; + url = "https://registry.yarnpkg.com/@accentor/api-client-js/-/api-client-js-0.12.1.tgz"; + sha1 = "7b784cb7afe077b39e0a9e8d619cb8bf34ae8281"; }; } { @@ -3530,11 +3530,11 @@ }; } { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.0.tgz"; + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.1.tgz"; path = fetchurl { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz"; - sha1 = "cdbad3bf1dbd2b177e9825737fe63b476a08f0c7"; + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz"; + sha1 = "e9ddb200efb6f3d05ffe83b1665a716af4a387e5"; }; } { @@ -5594,11 +5594,11 @@ }; } { - name = "localforage___localforage_1.9.0.tgz"; + name = "localforage___localforage_1.10.0.tgz"; path = fetchurl { - name = "localforage___localforage_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/localforage/-/localforage-1.9.0.tgz"; - sha1 = "f3e4d32a8300b362b4634cc4e066d9d00d2f09d1"; + name = "localforage___localforage_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz"; + sha1 = "5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"; }; } { @@ -7786,11 +7786,11 @@ }; } { - name = "sass___sass_1.37.5.tgz"; + name = "sass___sass_1.38.0.tgz"; path = fetchurl { - name = "sass___sass_1.37.5.tgz"; - url = "https://registry.yarnpkg.com/sass/-/sass-1.37.5.tgz"; - sha1 = "f6838351f7cc814c4fcfe1d9a20e0cabbd1e7b3c"; + name = "sass___sass_1.38.0.tgz"; + url = "https://registry.yarnpkg.com/sass/-/sass-1.38.0.tgz"; + sha1 = "2f3e60a1efdcdc910586fa79dc89d3399a145b4f"; }; } { diff --git a/patches/135080.patch b/patches/135080.patch deleted file mode 100644 index da3e665d..00000000 --- a/patches/135080.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c9fc9cb5e386add817e49cba119bff6fb5b77e0d Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Sat, 21 Aug 2021 16:53:46 +0200 -Subject: [PATCH] mu: 1.6.3 -> 1.6.4 - ---- - pkgs/tools/networking/mu/default.nix | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix -index 468bc127228a76..694c1f5e721f48 100644 ---- a/pkgs/tools/networking/mu/default.nix -+++ b/pkgs/tools/networking/mu/default.nix -@@ -7,13 +7,13 @@ - - stdenv.mkDerivation rec { - pname = "mu"; -- version = "1.6.3"; -+ version = "1.6.4"; - - src = fetchFromGitHub { - owner = "djcb"; - repo = "mu"; - rev = version; -- sha256 = "hmP2bcoBWMd2GZBE8XtJ5QePpWnkJV5pu69aDmL5V4g="; -+ sha256 = "rRBi6bgxkVQ94wLBqVQikIE0jVkvm1fjtEzFMsQTJz8="; - }; - - postPatch = lib.optionalString (batchSize != null) ''