From 8c33504431e9669f324db150174d5bc8de2bbfcf Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 14 Apr 2022 13:23:50 -0700 Subject: [PATCH] discourse: 2.9.0.beta3 -> 2.9.0.beta4 --- pkgs/servers/web-apps/discourse/default.nix | 6 +- .../plugins/discourse-assign/default.nix | 4 +- .../plugins/discourse-calendar/default.nix | 4 +- .../discourse-canned-replies/default.nix | 4 +- .../discourse-chat-integration/default.nix | 4 +- .../plugins/discourse-checklist/default.nix | 4 +- .../discourse-data-explorer/default.nix | 4 +- .../plugins/discourse-docs/default.nix | 4 +- .../plugins/discourse-github/Gemfile.lock | 2 +- .../plugins/discourse-github/default.nix | 4 +- .../plugins/discourse-github/gemset.nix | 4 +- .../plugins/discourse-math/default.nix | 4 +- .../discourse-openid-connect/default.nix | 4 +- .../plugins/discourse-prometheus/default.nix | 4 +- .../discourse-saved-searches/default.nix | 4 +- .../plugins/discourse-solved/default.nix | 4 +- .../discourse-spoiler-alert/default.nix | 4 +- .../plugins/discourse-voting/default.nix | 4 +- .../discourse-yearly-review/default.nix | 4 +- .../web-apps/discourse/rubyEnv/Gemfile | 4 +- .../web-apps/discourse/rubyEnv/Gemfile.lock | 46 +++++----- .../web-apps/discourse/rubyEnv/gemset.nix | 84 +++++++++---------- 22 files changed, 104 insertions(+), 106 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index b863a40dfc58..f192780e7fd2 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -11,13 +11,13 @@ }@args: let - version = "2.9.0.beta3"; + version = "2.9.0.beta4"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-+VYHGkISY4PFScUzk6eJ7eN9cPTjNEww/kusKcufMI0="; + sha256 = "sha256-DpUEBGLgjcroVzdDG8/nGvC+ym19ZkGa7qvHKZZ1mH4="; }; runtimeDeps = [ @@ -161,7 +161,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/app/assets/javascripts/yarn.lock"; - sha256 = "0xx5gncvb2mwpwwbgi4y320ji143i38vmz946xjcx5z3jxxjkymz"; + sha256 = "1l4nfc14cm42lkilsawfhdcnv1ln7m7bpan9a804abv4hwrs3f52"; }; assets = stdenv.mkDerivation { diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix index 7fa373106f7c..3cf491a2f42d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-assign"; - rev = "d8d2dc950a0512cc53885afbd1da26ea38fdf1e1"; - sha256 = "sha256-FRq/zL+Hiu/Pd/8HDOmFW8Uoovw9so1gKbM4by3jSYg="; + rev = "7a854fe5046783bcff6cc24fca818056e1b9414a"; + sha256 = "sha256-SGGwj0V4mTXD33tLnH76tQD/f6IvDbacq23XbaRdLsI="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index 15d7abfec19e..d935b37b5a11 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-calendar"; - rev = "c44d348c7739f08fe026f1d67dbd902cb2f4d590"; - sha256 = "sha256-+876F3/nGhqtwQn2D/v3WzqchemsocnneiYYFmjqGGo="; + rev = "eb8bc3e864c6f735fa5a005e854f8c37411b6288"; + sha256 = "sha256-fc3oQj2NqaTfmokJUryd2oBd/eVAcNOMMT0ZT45bU28="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-calendar"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix index e41574a2ca7e..07e58652d9fe 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-canned-replies"; - rev = "f9d1d87e352c0d1c41c1a8e4ef26b7766e39d2f1"; - sha256 = "sha256-luFPwcnH6faTJV7Bhx9nnaxkK5PHI9vqhHrFO0m49mg="; + rev = "18af3367d9eda8842e8ff0de96c90aa2f0bdb0a3"; + sha256 = "sha256-v8QOR0/9RUJ1zFmzhKYe/GEev3Jl4AlXWkQyuquyuJY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-canned-replies"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix index e279c12ce70b..f96348e6f273 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-chat-integration"; - rev = "0c367e19ca4c06ace067f1268c1a1a64d8da4253"; - sha256 = "sha256-X7bkAjINzKTrWcVd9MPl51Vy6pOWp378ACJJTSihQRc="; + rev = "eaa7de8c2b659d107c2b16ac0d469592aff79d7c"; + sha256 = "sha256-7anXDbltMBM22dBnE5FFwNk7IJEUFZgDzR4Q/AYn6ng="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-chat-integration"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix index c5958589fd19..d1bcd57fc66a 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-checklist"; - rev = "c4f3df0d825082eeaaa3fd9fceba0258080aa6fa"; - sha256 = "sha256-VGKDpu8tohMgSjMoTzhVnPLHMfLsXOejXL3bmQQ3jWM="; + rev = "68941e370e132c17fc2aa21ac40c033df72c9771"; + sha256 = "sha256-jJM/01fKxc1RBcSPt9/KDxMkBMH2AOp9dINxSneNhAs="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-checklist"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index 74c6b3eebb4f..8073d89df817 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-data-explorer"; - rev = "e7c19ac107dcd37618c7ac7b98530e99c7fe31db"; - sha256 = "sha256-w7IzniVlSArmR58Xk9U4MLolV61w/7t1C0nMqERM9J4="; + rev = "baaac7ce671e716559329ae756988cc395d7079e"; + sha256 = "sha256-bUCRfbKXdNbiJnU3xPMhG3s8kH7wQQoS2kV7ScHGOMQ="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-data-explorer"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index b006f62dc545..071b1eb5dd9b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "e517e69c09479654c197b1d620e6e7a5e69edca7"; - sha256 = "sha256-fbkuFWyY25V3B32a7NYtTcOlBot18JZYRth6ainHDQo="; + rev = "72b2e87e84221588bc2ff08961a492044f1f8237"; + sha256 = "sha256-moR4TJYffh6JwC7oxeS4+Cyngi88Ht2eTbSEJJ4JKdY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index a569496b5a89..ba0516980977 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -30,7 +30,7 @@ GEM octokit (4.22.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - public_suffix (4.0.6) + public_suffix (4.0.7) ruby2_keywords (0.0.5) sawyer (0.8.2) addressable (>= 2.3.5) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index 8970f8560516..f9ccaed863ef 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "810105186dbe8441852e2df9a9fc2ae8b8516ec6"; - sha256 = "sha256-96sqnvtEmm7sxFPAk6iDiYm7XChaQV+6HXZt/m5BtsI="; + rev = "36cbacdd32916435391b4700c024074da3bcbe74"; + sha256 = "sha256-R4Kp7NFMIXYDcAZlOUdhNdN/mmQMgXlLFolzo2OZahw="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index 62b54dbb0b0c..7bab2858b652 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -148,10 +148,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; type = "gem"; }; - version = "4.0.6"; + version = "4.0.7"; }; ruby2_keywords = { groups = ["default"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix index 85475db73fb1..d65087cca737 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-math"; - rev = "447c4811ea44d006da98dcbb6dfde142ada53567"; - sha256 = "sha256-iq3wWhYhOnh+QgChEsSIlRzDmD8kXbjNerVGfuNF7uY="; + rev = "b875a21b4d5225b61cb525531d30eaf852db6237"; + sha256 = "sha256-UKba9ZaVjIxOqUYdl00Z2sLt3Y+exBX7MJax8EzXB1Q="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-math"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix index d6282cd8c62e..e3c52319d279 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-openid-connect"; - rev = "dfcdc38d77aab4010cfe032cdd4155b4ae60ed14"; - sha256 = "sha256-I2cuyhA4jhhz+pJ5692/lRj6YRViP//HsoZOZjtu/e4="; + rev = "e897702139b9c0dca40b9385427ba8bad0e1eae9"; + sha256 = "sha256-miosXf4to60BqGsbXYEL37G38uVHrz2/2Pizn0Rlp2o="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-openid-connect"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index a1e540f7fd0d..e5d7259099ad 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -6,8 +6,8 @@ src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "834f8683dfae475483c50bdeec979a5fa4a1cf04"; - sha256 = "sha256-M7NnXUib/iKxQT+UTqicmrZONR/Z+oXl46BNgYf1SQM="; + rev = "43536e4a4977718972a673dc2475ae07df9a0a45"; + sha256 = "sha256-7sQldPLY7YW/sr4WBHWxJVvhvRK0LwO3+52HAIJFvY4="; }; patches = [ diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix index 84d801b12fa9..682032bb9d0f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-saved-searches"; - rev = "a7eafe288a2f93aa8cc7cf59d8173adc70c8f48a"; - sha256 = "sha256-Zli+tzNxLIwp5sZome+pXqvpsvqM/kXRbe73QtH0rTc="; + rev = "f008809ee3bf3a8a5c11daff0807d59ab4336a0c"; + sha256 = "sha256-/OyFL/9fLdVpsFQIlnjQ6ser6hdEs4X434nAaqKCTUE="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-saved-searches"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index e7b0adbb826b..ebec54bc6e5d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "9aba2bd6b7efbea3e46158fd0b1ce96a975379d7"; - sha256 = "sha256-RmYsDCDuVxXX91haljP6Jbx3s4Nl2RV6UU3PBQ/Xi7Y="; + rev = "17ba805a06ddfc27c6435eb20c0f8466f1708be8"; + sha256 = "sha256-G48c1khRVnCPXA8ujpDmEzL10uLC9e2sYVLVEXWIk0s="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix index 63cdeefd235e..b4f7e000fd64 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-spoiler-alert"; - rev = "7382d74af57f4476004014598135aec530b0342f"; - sha256 = "sha256-YyCG1bAfjJ9/itHlsZTBQgkRjgPKNKPzJopnP/Z7/NA="; + rev = "4a07519cf9d7ac713f5e21ba770adb127524a22d"; + sha256 = "sha256-pMTXdjqI4GrLNfZMbyPdeW+Jwieh6I4O/pT2Yyf4ltA="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-spoiler-alert"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix index f2a97d9e44d6..4d0f71fdd7f6 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-voting"; - rev = "2de1fe5df1a5c25ad1e0e31e8d28adca315d9092"; - sha256 = "sha256-XxrRPIc9F78wHF6p1qqUZhkPqKWSebqGZn9P5lNTDeo="; + rev = "1da667721269ca01ef53c35ec0470486b490e72c"; + sha256 = "sha256-VCMv6YWHY24v9KyO4q0YSSYK+mszOVqP46slOh8okvY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-voting"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index 62e943537a6c..e38aa7f83571 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-yearly-review"; - rev = "f2224b38c96c8772ce6cc64514b8a3edaa42ebb9"; - sha256 = "sha256-dJtQXaLsADXcsADzExGPj3L2x4zlNfsQCNBk17W0a5A="; + rev = "ef4855f6afa16ef86013bba7da8e50a63e11b493"; + sha256 = "sha256-IVKGysAKr+lKV1CO1JJIMLtzcvpK8joWjx8Bfy+dx8Y="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-yearly-review"; diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index c66a3f25542c..2766c3feadc0 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -31,9 +31,7 @@ end gem 'json' -# TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals -# This is a desired upgrade we should get to. -gem 'sprockets', '3.7.2' +gem 'sprockets' # this will eventually be added to rails, # allows us to precompile all our templates in the unicorn master diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 7ae505b5c194..4e832c8abdb1 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -92,7 +92,7 @@ GEM chunky_png (1.4.0) coderay (1.1.3) colored2 (3.1.2) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) connection_pool (2.2.5) cose (1.2.0) cbor (~> 0.5.9) @@ -129,10 +129,10 @@ GEM sprockets (>= 3.3, < 4.1) ember-source (2.18.2) erubi (1.10.0) - excon (0.92.1) + excon (0.92.2) execjs (2.8.1) exifr (1.3.9) - fabrication (2.27.0) + fabrication (2.28.0) faker (2.20.0) i18n (>= 1.8.11, < 2) fakeweb (1.3.0) @@ -194,7 +194,7 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - json_schemer (0.2.19) + json_schemer (0.2.20) ecma-re-validator (~> 0.3) hana (~> 1.3) regexp_parser (~> 2.0) @@ -206,7 +206,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) literate_randomizer (0.4.0) - lograge (0.11.2) + lograge (0.12.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) @@ -215,7 +215,7 @@ GEM logstash-logger (0.26.1) logstash-event (~> 1.2) logster (2.11.0) - loofah (2.15.0) + loofah (2.16.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -236,13 +236,13 @@ GEM ffi (~> 1.9) minitest (5.15.0) mocha (1.13.0) - msgpack (1.4.5) + msgpack (1.5.1) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) mustache (1.1.1) nio4r (2.5.8) - nokogiri (1.13.3) + nokogiri (1.13.4) mini_portile2 (~> 2.8.0) racc (~> 1.4) oauth (0.5.8) @@ -280,12 +280,12 @@ GEM openssl-signature_algorithm (1.1.1) openssl (~> 2.0) optimist (3.0.1) - parallel (1.22.0) - parallel_tests (3.7.3) + parallel (1.22.1) + parallel_tests (3.8.1) parallel - parser (3.1.1.0) + parser (3.1.2.0) ast (~> 2.4.1) - pg (1.3.4) + pg (1.3.5) progress (3.6.0) pry (0.13.1) coderay (~> 1.1) @@ -295,8 +295,8 @@ GEM pry (~> 0.13.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.6) - puma (5.6.2) + public_suffix (4.0.7) + puma (5.6.4) nio4r (~> 2.0) r2 (0.2.7) racc (1.6.0) @@ -339,7 +339,7 @@ GEM redis (4.5.1) redis-namespace (1.8.2) redis (>= 3.0.4) - regexp_parser (2.2.1) + regexp_parser (2.3.0) request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) @@ -361,7 +361,7 @@ GEM rspec-html-matchers (0.9.4) nokogiri (~> 1) rspec (>= 3.0.0.a, < 4) - rspec-mocks (3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) rspec-rails (5.1.1) @@ -380,7 +380,7 @@ GEM json-schema (~> 2.2) railties (>= 3.1, < 7.1) rtlit (0.0.5) - rubocop (1.26.0) + rubocop (1.27.0) parallel (~> 1.10) parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) @@ -389,7 +389,7 @@ GEM rubocop-ast (>= 1.16.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.16.0) + rubocop-ast (1.17.0) parser (>= 3.1.1.0) rubocop-discourse (2.5.0) rubocop (>= 1.1.0) @@ -430,7 +430,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sprockets (3.7.2) + sprockets (4.0.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.4.2) @@ -439,7 +439,7 @@ GEM sprockets (>= 3.0.0) sshkey (2.0.0) stackprof (0.2.19) - test-prof (1.0.7) + test-prof (1.0.8) thor (1.2.1) tilt (2.0.10) tzinfo (2.0.4) @@ -453,7 +453,7 @@ GEM unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) - uniform_notifier (1.15.0) + uniform_notifier (1.16.0) uri_template (0.7.0) webmock (3.14.0) addressable (>= 2.8.0) @@ -583,7 +583,7 @@ DEPENDENCIES shoulda-matchers sidekiq simplecov - sprockets (= 3.7.2) + sprockets sprockets-rails sshkey stackprof @@ -598,4 +598,4 @@ DEPENDENCIES yaml-lint BUNDLED WITH - 2.3.5 + 2.3.9 diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 72748dad501b..84f4c37dfb22 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -351,10 +351,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; connection_pool = { groups = ["default"]; @@ -573,10 +573,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12d0xkb2qkydygs4py2z2m7vzx0hygx2dnyk98ja8lkj2k348925"; + sha256 = "01pcl1vx60x3f28rs6iw1lgqxycgb2yxq2p45k7b4a8liadykhba"; type = "gem"; }; - version = "0.92.1"; + version = "0.92.2"; }; execjs = { groups = ["assets" "default"]; @@ -603,10 +603,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zmak7fgis1nk9j157g2rjzxrw9prr3jzlxap9vix3xm0gkihr53"; + sha256 = "0rgbmk044akxa84z9vdl8lkmd9z4xy3na1w0vh12pz02drxd93j9"; type = "gem"; }; - version = "2.27.0"; + version = "2.28.0"; }; faker = { dependencies = ["i18n"]; @@ -1012,10 +1012,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03lzdfwpmywxc6l5apnhfjwl8swf9jz2ajwjgq38am0q60ggjrcf"; + sha256 = "1ahcnfw3lchyyq7ixjfghkw709fbm8mkqsqq9yhd9in3bhzywa88"; type = "gem"; }; - version = "0.2.19"; + version = "0.2.20"; }; jwt = { groups = ["default"]; @@ -1080,10 +1080,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vrjm4yqn5l6q5gsl72fmk95fl6j9z1a05gzbrwmsm3gp1a1bgac"; + sha256 = "15pjm9pa5m3mbv9xvfgfr16q4jyaznsg8y63jz9x4jqr8npw0vx3"; type = "gem"; }; - version = "0.11.2"; + version = "0.12.0"; }; logstash-event = { groups = ["default"]; @@ -1122,10 +1122,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yp1h1j7pdkqvnx8jl6bkzlajav3h5mhqzihgs9p6y3c8927mw23"; + sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; type = "gem"; }; - version = "2.15.0"; + version = "2.16.0"; }; lru_redux = { groups = ["default"]; @@ -1303,10 +1303,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cshgsx3hmpgx639xyqjqa2q3hgrhlyr9rpwhsglsx529alqq125"; + sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw"; type = "gem"; }; - version = "1.4.5"; + version = "1.5.1"; }; multi_json = { groups = ["default"]; @@ -1364,10 +1364,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd"; type = "gem"; }; - version = "1.13.3"; + version = "1.13.4"; }; oauth = { groups = ["default"]; @@ -1518,10 +1518,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bncdqm62l1q8flw10gl86gcc74zm89s5vrjww73i3094jg64pam"; + sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; type = "gem"; }; - version = "1.22.0"; + version = "1.22.1"; }; parallel_tests = { dependencies = ["parallel"]; @@ -1529,10 +1529,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vsfsfd194xnzjz94ml157w61fnag8jg47b4bssc508kb3vmk20w"; + sha256 = "01kzjshbim0w5ax7vcjfxvb83x2pglws7qr43x0qkd731f8w10f7"; type = "gem"; }; - version = "3.7.3"; + version = "3.8.1"; }; parser = { dependencies = ["ast"]; @@ -1540,20 +1540,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c"; + sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d"; type = "gem"; }; - version = "3.1.1.0"; + version = "3.1.2.0"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "090c3kazlmiizp25las7dgi8wlc11s29nrs2gy3qrp1z8qikgcmb"; + sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; progress = { groups = ["default"]; @@ -1603,10 +1603,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; type = "gem"; }; - version = "4.0.6"; + version = "4.0.7"; }; puma = { dependencies = ["nio4r"]; @@ -1614,10 +1614,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56"; + sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw"; type = "gem"; }; - version = "5.6.2"; + version = "5.6.4"; }; r2 = { groups = ["default"]; @@ -1849,10 +1849,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; + sha256 = "0a6nxfq3ln1i109jx172n33s73a90l8g04h8p56bmw9phj467h9k"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.0"; }; request_store = { dependencies = ["rack"]; @@ -1966,10 +1966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3"; + sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm"; type = "gem"; }; - version = "3.11.0"; + version = "3.11.1"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -2030,10 +2030,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03c6v6bfqdw8vnda0if0sx7aff0iq6xnv1adyfs0bi9msgggafcr"; + sha256 = "00d9nzlnbxr3jqkya2b2rcahs9l22qpdk5qf3y7pws8m555l8slk"; type = "gem"; }; - version = "1.26.0"; + version = "1.27.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2041,10 +2041,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv"; + sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.0"; }; rubocop-discourse = { dependencies = ["rubocop" "rubocop-rspec"]; @@ -2226,10 +2226,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + sha256 = "19k5cwg8gyb6lkmz4kab7c5nlplpgj64jy7vw8p5l2i2ysq5hym0"; type = "gem"; }; - version = "3.7.2"; + version = "4.0.3"; }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; @@ -2271,10 +2271,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vg0zjfgibdcgkzb4c25v0f4v6v8mvpzvgcag194rwglmkkyrwkx"; + sha256 = "04yxdm2cdhwp0wsp8891f06cprp4442p3mlgpdc4pziflpfvaw05"; type = "gem"; }; - version = "1.0.7"; + version = "1.0.8"; }; thor = { groups = ["default" "development" "test"]; @@ -2371,10 +2371,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00dj2vsz9sq5i9wnncbiy4v5vayqbssppazzigd1ibpl60pzfxkq"; + sha256 = "1dfvqixshwvm82b9qwdidvnkavdj7s0fbdbmyd4knkl6l3j9xcwr"; type = "gem"; }; - version = "1.15.0"; + version = "1.16.0"; }; uri_template = { groups = ["default"];