diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/servers/web-apps/discourse | |
parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/servers/web-apps/discourse')
52 files changed, 1388 insertions, 1110 deletions
diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch b/nixpkgs/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch index 3872eb751406..d6a4ff8f2a78 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch +++ b/nixpkgs/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch @@ -1,12 +1,12 @@ diff --git a/config/environments/production.rb b/config/environments/production.rb -index a523888a8d..422c2c1ee8 100644 +index 6b73c82e9d..0cefea6fc0 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb -@@ -32,6 +32,7 @@ Discourse::Application.configure do +@@ -32,5 +32,6 @@ Discourse::Application.configure do user_name: GlobalSetting.smtp_user_name, password: GlobalSetting.smtp_password, authentication: GlobalSetting.smtp_authentication, + ca_file: "/etc/ssl/certs/ca-certificates.crt", - enable_starttls_auto: GlobalSetting.smtp_enable_start_tls - } - + enable_starttls_auto: GlobalSetting.smtp_enable_start_tls, + open_timeout: GlobalSetting.smtp_open_timeout, + read_timeout: GlobalSetting.smtp_read_timeout \ No newline at end of file diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/asserts_patch-package_from_path.patch b/nixpkgs/pkgs/servers/web-apps/discourse/asserts_patch-package_from_path.patch new file mode 100644 index 000000000000..9f7d98b069f4 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/asserts_patch-package_from_path.patch @@ -0,0 +1,13 @@ +diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json +index 9e4533d2..e57f8a5f 100644 +--- a/app/assets/javascripts/discourse/package.json ++++ b/app/assets/javascripts/discourse/package.json +@@ -14,7 +14,7 @@ + "build": "ember build", + "start": "ember serve", + "test": "ember test", +- "postinstall": "yarn --silent --cwd .. patch-package" ++ "postinstall": "patch-package" + }, + "dependencies": { + "@babel/core": "^7.21.4", diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/default.nix index 6986cf5271e7..b07425860bf5 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/default.nix @@ -1,25 +1,60 @@ -{ stdenv, pkgs, makeWrapper, runCommand, lib, writeShellScript -, fetchFromGitHub, bundlerEnv, callPackage - -, ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk, nettools -, imagemagick, optipng, pngquant, libjpeg, jpegoptim, gifsicle, jhead -, oxipng, libpsl, redis, postgresql, which, brotli, procps, rsync, icu -, fetchYarnDeps, yarn, fixup_yarn_lock, nodePackages, nodejs-14_x -, nodejs-16_x +{ stdenv +, pkgs +, makeWrapper +, runCommand +, lib +, writeShellScript +, fetchFromGitHub +, bundlerEnv +, callPackage + +, ruby_3_2 +, replace +, gzip +, gnutar +, git +, cacert +, util-linux +, gawk +, nettools +, imagemagick +, optipng +, pngquant +, libjpeg +, jpegoptim +, gifsicle +, jhead +, oxipng +, libpsl +, redis +, postgresql +, which +, brotli +, procps +, rsync +, icu +, fetchYarnDeps +, yarn +, fixup_yarn_lock +, nodePackages +, nodejs_16 +, dart-sass-embedded , plugins ? [] }@args: let - version = "2.9.0.beta9"; + version = "3.1.0.beta4"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-pavNdAbk9yuWRg++p1MCmpBMuYKDs63QbJpHrPS9oAY="; + sha256 = "sha256-22GXFYPjPYL20amR4xFB4L/dCp32H4Z3uf0GLGEghUE="; }; + ruby = ruby_3_2; + runtimeDeps = [ # For backups, themes and assets rubyEnv.wrappedRuby @@ -125,9 +160,9 @@ let cd ../.. mkdir -p vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/ - ln -s "${nodejs-16_x.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a + ln -s "${nodejs_16.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a - ln -s ${nodejs-16_x.libv8}/include vendor/v8/include + ln -s ${nodejs_16.libv8}/include vendor/v8/include mkdir -p ext/libv8-node echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml @@ -152,6 +187,20 @@ let cp $(readlink -f ${libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so ''; }; + sass-embedded = gems.sass-embedded // { + dontBuild = false; + # `sass-embedded` depends on `dart-sass-embedded` and tries to + # fetch that as `.tar.gz` from GitHub releases. That `.tar.gz` + # can also be specified via `SASS_EMBEDDED`. But instead of + # compressing our `dart-sass-embedded` just to decompress it + # again, we simply patch the Rakefile to symlink that path. + patches = [ + ./rubyEnv/sass-embedded-static.patch + ]; + postPatch = '' + export SASS_EMBEDDED=${dart-sass-embedded}/bin + ''; + }; }; groups = [ @@ -159,22 +208,23 @@ let ]; }; - yarnOfflineCache = fetchYarnDeps { - yarnLock = src + "/app/assets/javascripts/yarn.lock"; - sha256 = "14d7y29460ggqcjnc9vk1q2lnxfl6ycyp8rc103g3gs2bl5sb6r0"; - }; - assets = stdenv.mkDerivation { pname = "discourse-assets"; inherit version src; + yarnOfflineCache = fetchYarnDeps { + yarnLock = src + "/app/assets/javascripts/yarn.lock"; + sha256 = "0a20kns4irdpzzx2dvdjbi0m3s754gp737q08z5nlcnffxqvykrk"; + }; + nativeBuildInputs = runtimeDeps ++ [ postgresql redis nodePackages.uglify-js nodePackages.terser + nodePackages.patch-package yarn - nodejs-14_x + nodejs_16 ]; outputs = [ "out" "javascripts" ]; @@ -192,6 +242,12 @@ let # Fix the rake command used to recursively execute itself in the # assets precompilation task. ./assets_rake_command.patch + + # `app/assets/javascripts/discourse/package.json`'s postinstall + # hook tries to call `../node_modules/.bin/patch-package`, which + # hasn't been `patchShebangs`-ed yet. So instead we just use + # `patch-package` from `nativeBuildInputs`. + ./asserts_patch-package_from_path.patch ]; # We have to set up an environment that is close enough to @@ -203,7 +259,7 @@ let export HOME=$NIX_BUILD_TOP/fake_home # Make yarn install packages from our offline cache, not the registry - yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + yarn config --offline set yarn-offline-mirror $yarnOfflineCache # Fixup "resolved"-entries in yarn.lock to match our offline cache ${fixup_yarn_lock}/bin/fixup_yarn_lock app/assets/javascripts/yarn.lock @@ -261,10 +317,6 @@ let runHook postInstall ''; - - passthru = { - inherit yarnOfflineCache; - }; }; discourse = stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/how_to_update.md b/nixpkgs/pkgs/servers/web-apps/discourse/how_to_update.md new file mode 100644 index 000000000000..c402325babc8 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/how_to_update.md @@ -0,0 +1,24 @@ +To update discourse, do the following: + +1. Switch to and work from the `master` branch and the directory this + file is in. +2. Run `./update.py print-diffs` and update the nginx settings and + backend settings accordingly. If you don't know how to, ask for + help - do not skip this step! +3. Run `./update.py update`. +4. Run `nix build -L -f ../../../../ discourse.tests` to make sure the + update works. Also test manually, if possible. +5. If the update works, commit it. If not, apply necessary fixes and + commit. No manual fixes that would be overwritten by the + `./update.py` script should be committed - the script should be + fixed instead. +6. Run `./update.py update-mail-receiver`. If there's an update, do + step 4 and 5 again. +7. Run `./update.py update-plugins`. +8. Run `nix build -L -f ../../../../ discourseAllPlugins.tests` to + make sure the plugins build and discourse starts with them. Also + test manually, if possible. +9. If the update works, commit it. If not, apply necessary fixes and + commit. No manual fixes that would be overwritten by the + `./update.py` script should be committed - the script should be + fixed instead. diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/mail_receiver/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/mail_receiver/default.nix index c1a3a2df1064..139e6718ed5e 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/mail_receiver/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/mail_receiver/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0grifm5qyqazq63va3w26xjqnxwmfixhx0fx0zy7kd39378wwa6i"; }; - nativeBuildInputs = [ replace ]; - buildInputs = [ ruby makeWrapper ]; + nativeBuildInputs = [ replace makeWrapper ]; + buildInputs = [ ruby ]; dontBuild = true; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix index e36f1416456a..4ddb8995b622 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix @@ -4,6 +4,7 @@ let in { discourse-assign = callPackage ./discourse-assign {}; + discourse-bbcode-color = callPackage ./discourse-bbcode-color {}; discourse-calendar = callPackage ./discourse-calendar {}; discourse-canned-replies = callPackage ./discourse-canned-replies {}; discourse-chat-integration = callPackage ./discourse-chat-integration {}; @@ -14,8 +15,10 @@ in discourse-ldap-auth = callPackage ./discourse-ldap-auth {}; discourse-math = callPackage ./discourse-math {}; discourse-migratepassword = callPackage ./discourse-migratepassword {}; + discourse-oauth2-basic = callPackage ./discourse-oauth2-basic {}; discourse-openid-connect = callPackage ./discourse-openid-connect {}; discourse-prometheus = callPackage ./discourse-prometheus {}; + discourse-reactions = callPackage ./discourse-reactions {}; discourse-saved-searches = callPackage ./discourse-saved-searches {}; discourse-solved = callPackage ./discourse-solved {}; discourse-spoiler-alert = callPackage ./discourse-spoiler-alert {}; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix index 8dc8377ac95e..9e859795298e 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-assign"; - rev = "030cdc2d9c06cd2fed24fa47861b0213fd2d854e"; - sha256 = "sha256-3JBBxgWWkCAHci+Cv69o+4JY1b70yOckE+1y5ipl5a8="; + rev = "a655a009fade4671e4a2d38f0a0f7ce89d201d80"; + sha256 = "sha256-HCwId3/7NRuToLFyJrOVaAiSxysB7XNZp9BUndSJzlY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix new file mode 100644 index 000000000000..4e5ea7be8e65 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix @@ -0,0 +1,17 @@ +{ lib, mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-bbcode-color"; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-bbcode-color"; + rev = "f9ebbf016c8c5c763473ff36cc30fdcdf8fcf480"; + sha256 = "sha256-7iCKhMdVlFdHMXxU8mQMU1vFiAbr1qKvG29VdAki+14="; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-bbcode-color"; + maintainers = with maintainers; [ ryantm ]; + license = licenses.mit; + description = "Support BBCode color tags."; + }; +} diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile index faf4db6ca825..76faf85df5e2 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile @@ -3,4 +3,4 @@ source "https://rubygems.org" # gem "rails" -gem 'rrule', '0.4.4', require: false +gem "rrule", "0.4.4", require: false diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock index 4de4b6e42dde..5c69ae645aa5 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -1,18 +1,18 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.3.1) + activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - concurrent-ruby (1.1.10) - i18n (1.12.0) + concurrent-ruby (1.2.2) + i18n (1.13.0) concurrent-ruby (~> 1.0) - minitest (5.16.2) + minitest (5.18.0) rrule (0.4.4) activesupport (>= 2.3) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) PLATFORMS @@ -22,4 +22,4 @@ DEPENDENCIES rrule (= 0.4.4) BUNDLED WITH - 2.3.9 + 2.4.10 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index 922adc60b618..1ec357e301cc 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-calendar"; - rev = "3cf82dcc6c717965e1d1ff384965e2ee215402f0"; - sha256 = "sha256-D6FP+vgCqi+wLV+gFAPTAAND3os7mcvpl2z8c5JiFxo="; + rev = "d85e8e288d69788e0c3202bb3dab9c3450a98914"; + sha256 = "sha256-mSn2gGidH4iSZ0fhf3UPh9pwMQurK0YGW2OAtdEWFBQ="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-calendar"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix index e2db1930298d..8c06a78e3733 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix @@ -5,20 +5,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15lbq28v48i6q118p02m5zs9c63y1kv2h5krb3ss6q2vyaxhnfz7"; + sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.3"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.2"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -26,20 +26,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; + sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; type = "gem"; }; - version = "5.16.2"; + version = "5.18.0"; }; rrule = { dependencies = ["activesupport"]; @@ -58,9 +58,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; } diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix index 07d1afb2da49..8fb400507d05 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ b/nixpkgs/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 = "faa586b095a9ec5b0088bdfa7b04a3aba9f44521"; - sha256 = "sha256-f/9JtPtYZsRIzk3cBlXAtdG25oep7/Kl74JsGkoP4PI="; + rev = "5a2d9a11ef3f07fc781acd83770bafc14eca2c1b"; + sha256 = "sha256-R6CmL1hqqybc/I3oAzr3xZ4WThPWQirMjlXkF82xmIk="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-canned-replies"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix index 6f70efa90ab1..40475dbcfa94 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ b/nixpkgs/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 = "c68fde5d2bbb92cad24a35ff61586453d67264f5"; - sha256 = "sha256-Gmy8I/MbIdicHqZjlwNDz8PdCdxptzynd1pyL4BM5z4="; + rev = "9647c7afc0df42b8e2b5ae585afaf51f107fa195"; + sha256 = "sha256-lP404OJvEEQVKIQTBMca7zb/YxQ6HXcPG1jMKpEB3iA="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-chat-integration"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix index e8de49349f0c..7c402028d660 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-checklist"; - rev = "8763292e9a02fc2fed6d39c59c3cf5401dcdd950"; - sha256 = "sha256-xUsTjoG25efIumrf6XX8rAKWjfcAhZiqQz9pfnG3pQU="; + rev = "4a7f3df360a8e4ff3bbebfed33ea545b1c72506e"; + sha256 = "sha256-lu8Ry3sUsKnr1nMfR29hbhsfJXLaN5NPuz8iGfsfHTc="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-checklist"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index 198b1e5aba52..b824a2dec2fb 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/nixpkgs/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 = "bf56ab3559328cdf89cdd5b32ec32f41aa87017e"; - sha256 = "sha256-JoqOmv/x9aiSXBAwXO1PSg0E/1eb19dNXxqCLOIyHvo="; + rev = "f99b3af7ed4a21474f35223e83013ee3e8ad7002"; + sha256 = "sha256-3bBKBSc/+yF9ogNj3J6HXM3ynoAoUZeHhZOOhTfbxDw="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-data-explorer"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index 3587c9ef2a13..a60ad45e298f 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "13bab928c72c847c4c3f7ebb8600343b48f14a5f"; - sha256 = "sha256-Gno+dbu8/l/cdrzJZL82DmMilZ5zJScFaQ88x8Hum0k="; + rev = "0b4d2f3691048b6e0e257a1ac9ed01f66f662ba8"; + sha256 = "sha256-HeIUCTbMNpuo6zeaDClsGrUOz4m0L+4UK7AwPsrKIHY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile index ae97d9198459..c24a3e860d7c 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile @@ -3,5 +3,5 @@ source "https://rubygems.org" # gem "rails" -gem 'sawyer', '0.8.2' -gem 'octokit', '4.22.0' +gem "sawyer", "0.9.2" +gem "octokit", "5.6.1" diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index b31ad9452c4d..e63a9486d30f 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -1,47 +1,27 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - faraday (1.10.1) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) + addressable (2.8.4) + public_suffix (>= 2.0.2, < 6.0) + faraday (2.7.4) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - multipart-post (2.2.3) - octokit (4.22.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) - public_suffix (4.0.7) + faraday-net_http (3.0.2) + octokit (5.6.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + public_suffix (5.0.1) ruby2_keywords (0.0.5) - sawyer (0.8.2) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) + faraday (>= 0.17.3, < 3) PLATFORMS ruby DEPENDENCIES - octokit (= 4.22.0) - sawyer (= 0.8.2) + octokit (= 5.6.1) + sawyer (= 0.9.2) BUNDLED WITH - 2.3.9 + 2.4.10 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index e53ac21892b0..e0868aad42ed 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "739bdf9ecc0bfe5256a4814fbc758168552ae069"; - sha256 = "sha256-pD6sqvUfHUb/5J0HpgqHmYsJnrFcB1ubZR/PMU/GApU="; + rev = "77e336a1b4ea08e2bb8a010d30146e4844afb3f3"; + sha256 = "sha256-VHuf4ymT+W676RAuA3WPQl9QXLdQz4s8vP9EC8XAwW0="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index ab21dcdc72fb..b25a91671cbd 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -5,132 +5,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.4"; }; 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"]; + dependencies = ["faraday-net_http" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "037w5kg3y9jrwgg7izfn1pmzngy0hdhcr7slmxwqa3mdb4rx9r9q"; + sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj"; type = "gem"; }; - version = "1.10.1"; - }; - faraday-em_http = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-em_synchrony = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-excon = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; - type = "gem"; - }; - version = "1.1.0"; - }; - faraday-httpclient = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; - type = "gem"; - }; - version = "1.0.1"; - }; - faraday-multipart = { - dependencies = ["multipart-post"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; - type = "gem"; - }; - version = "1.0.4"; + version = "2.7.4"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; - type = "gem"; - }; - version = "1.0.1"; - }; - faraday-net_http_persistent = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; - type = "gem"; - }; - version = "1.2.0"; - }; - faraday-patron = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-rack = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-retry = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; - type = "gem"; - }; - version = "1.0.3"; - }; - multipart-post = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; + sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; type = "gem"; }; - version = "2.2.3"; + version = "3.0.2"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -138,20 +37,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nmdd7klyinvrrv2mggwwmc99ykaq7i379j00i37hvvaqx4giifj"; + sha256 = "15g4kyag6gmxxq6d03472h7srm3imlsks1wg6nac7hl3mb1b5vs8"; type = "gem"; }; - version = "4.22.0"; + version = "5.6.1"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.1"; }; ruby2_keywords = { groups = ["default"]; @@ -169,9 +68,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; + sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps"; type = "gem"; }; - version = "0.8.2"; + version = "0.9.2"; }; } diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile index 2602ef5c72b5..e140770e4e6a 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile @@ -5,5 +5,5 @@ source "https://rubygems.org" # gem "rails" gem 'pyu-ruby-sasl', '0.0.3.3', require: false gem 'rubyntlm', '0.3.4', require: false -gem 'net-ldap', '0.14.0' +gem 'net-ldap', '0.17.1' gem 'omniauth-ldap', '1.0.5' diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock index 9ed9dcc8ef91..f131626f7c45 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock @@ -2,8 +2,8 @@ GEM remote: https://rubygems.org/ specs: hashie (5.0.0) - net-ldap (0.14.0) - omniauth (1.9.1) + net-ldap (0.17.1) + omniauth (1.9.2) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) omniauth-ldap (1.0.5) @@ -12,17 +12,17 @@ GEM pyu-ruby-sasl (~> 0.0.3.2) rubyntlm (~> 0.3.4) pyu-ruby-sasl (0.0.3.3) - rack (2.2.3) + rack (2.2.7) rubyntlm (0.3.4) PLATFORMS ruby DEPENDENCIES - net-ldap (= 0.14.0) + net-ldap (= 0.17.1) omniauth-ldap (= 1.0.5) pyu-ruby-sasl (= 0.0.3.3) rubyntlm (= 0.3.4) BUNDLED WITH - 2.3.9 + 2.4.10 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix index 0fc71fad2615..82f13f0d0d8a 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "jonmbake"; repo = "discourse-ldap-auth"; - rev = "a7a2e35eb5a8f6ee3b90bf48424efcb2a66c9989"; - sha256 = "sha256-Dsb12bZEZlNjFGw1GX7zt2hDVM9Ua+MDWSmBn4HEvs0="; + rev = "edcf06957090e8d978a89fe7b07a6ba56fe35214"; + sha256 = "sha256-VxBBip8QEXDQGDOsU5cXjUZe2HThJn20BPsNr33KhKI="; }; meta = with lib; { homepage = "https://github.com/jonmbake/discourse-ldap-auth"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix index 7d5816cf53cb..9df3292f7b82 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18fyxfbh32ai72cwgz8s9w0fg0xq7j534y217flw54mmzsj8i6qp"; + sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; type = "gem"; }; - version = "0.14.0"; + version = "0.17.1"; }; omniauth = { dependencies = ["hashie" "rack"]; @@ -25,10 +25,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz"; + sha256 = "1jn9j54l5h7xcba2vjq74l1dk0xrwvsjxam4qhylpi52nw0h5502"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.7"; }; rubyntlm = { groups = ["default"]; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix index b18bf07789b0..d15a962c19d8 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-math"; - rev = "bcaccbd845825e99c39060e3898e8d5ea1bba927"; - sha256 = "sha256-c/4oVDBhDiPrLSooU9TgDQJSij8i+QYCoNqDCicXPJk="; + rev = "69494ca5a4d708e16e35f1daebeaa53e3edbca2c"; + sha256 = "sha256-C0iVUwj+Lbe6TGfkbu6WxdCeMWVjBaejUh6fXVTqq08="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-math"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile index a00258a7e5af..59c64586dc17 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile @@ -3,8 +3,8 @@ source "https://rubygems.org" # gem "rails" -gem 'bcrypt', '3.1.3' +gem 'bcrypt', '3.1.13' gem 'unix-crypt', '1.3.0' gem 'ffi', '1.15.5', require: false gem 'ffi-compiler', '1.0.1', require: false -gem 'argon2', '2.1.1' +gem 'argon2', '2.2.0' diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock index 255d3f2d2401..4c6c3bab9987 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock @@ -1,10 +1,10 @@ GEM remote: https://rubygems.org/ specs: - argon2 (2.1.1) - ffi (~> 1.14) + argon2 (2.2.0) + ffi (~> 1.15) ffi-compiler (~> 1.0) - bcrypt (3.1.3) + bcrypt (3.1.13) ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) @@ -16,11 +16,11 @@ PLATFORMS ruby DEPENDENCIES - argon2 (= 2.1.1) - bcrypt (= 3.1.3) + argon2 (= 2.2.0) + bcrypt (= 3.1.13) ffi (= 1.15.5) ffi-compiler (= 1.0.1) unix-crypt (= 1.3.0) BUNDLED WITH - 2.3.9 + 2.4.6 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix index 962c10ad7db5..c0c89d98be2c 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "communiteq"; repo = "discourse-migratepassword"; - rev = "7d33a57b4bd2a37badc64d5eca57d7ca01d62937"; - sha256 = "sha256-BDBXgsLVHYiSSjvN4Y13ffwfWk6nuVLoJE1YKgGmLTA="; + rev = "f78774242eb9bf49a72d2800a39a24eeaa3b401a"; + sha256 = "sha256-QJO+ei9/l7ye+kWE9VmiIuNCiOH66kd3vds49qlIztY="; }; meta = with lib; { homepage = "https://github.com/communiteq/discourse-migratepassword"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix index 00877ed48199..97aa9bfc7048 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix @@ -5,20 +5,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g4qsdq072fyrsa7r0sg456dhrb017jmzdbnnzl2c80ha40bbmhg"; + sha256 = "1wdllcqlr81nzyf485ldv1p660xsi476p79ghbj7zsf3n9n86gwd"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.0"; }; bcrypt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2gqv8vry4ps0asb7nn1z4zxi3mcscy7yrim0npdd294ffyinvj"; + sha256 = "0ai0m15jg3n0b22mimk09ppnga316dc7dyvz06w8rrqh5gy1lslp"; type = "gem"; }; - version = "3.1.3"; + version = "3.1.13"; }; ffi = { groups = ["default"]; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile new file mode 100644 index 000000000000..7da32ec03949 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +source 'https://rubygems.org' + +group :development do + gem 'rubocop-discourse' +end diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock new file mode 100644 index 000000000000..6a91a08c0e86 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock @@ -0,0 +1,37 @@ +GEM + remote: https://rubygems.org/ + specs: + ast (2.4.2) + parallel (1.22.1) + parser (3.1.1.0) + ast (~> 2.4.1) + rainbow (3.1.1) + regexp_parser (2.2.1) + rexml (3.2.5) + rubocop (1.26.1) + parallel (~> 1.10) + parser (>= 3.1.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.16.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.16.0) + parser (>= 3.1.1.0) + rubocop-discourse (2.5.0) + rubocop (>= 1.1.0) + rubocop-rspec (>= 2.0.0) + rubocop-rspec (2.9.0) + rubocop (~> 1.19) + ruby-progressbar (1.11.0) + unicode-display_width (2.1.0) + +PLATFORMS + ruby + +DEPENDENCIES + rubocop-discourse + +BUNDLED WITH + 2.1.4 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix new file mode 100644 index 000000000000..a013383d1a2f --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix @@ -0,0 +1,18 @@ +{ lib, mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin rec { + name = "discourse-oauth2-basic"; + bundlerEnvArgs.gemdir = ./.; + src = fetchFromGitHub { + owner = "discourse"; + repo = name; + rev = "06ba5daa9aabd0487f2f30b944b6500f1f481308"; + sha256 = "sha256-T08Q36k2hb9wVimKIa4O5mWcrr6VBTfHvhRJiLBiRPY="; + }; + meta = with lib; { + homepage = "https://github.com/discourse/${name}"; + maintainers = with maintainers; [ ehmry ]; + license = licenses.mit; + description = "A basic OAuth2 plugin for use with Discourse"; + }; +} diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix new file mode 100644 index 000000000000..bbb35327787b --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix @@ -0,0 +1,127 @@ +{ + ast = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; + type = "gem"; + }; + version = "2.4.2"; + }; + parallel = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; + type = "gem"; + }; + version = "1.22.1"; + }; + parser = { + dependencies = ["ast"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c"; + type = "gem"; + }; + version = "3.1.1.0"; + }; + rainbow = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; + type = "gem"; + }; + version = "3.1.1"; + }; + regexp_parser = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; + type = "gem"; + }; + version = "2.2.1"; + }; + rexml = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + rubocop = { + dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06105yrqajpm5l07fng1nbk55y9490hny542zclnan8hg841pjgl"; + type = "gem"; + }; + version = "1.26.1"; + }; + rubocop-ast = { + dependencies = ["parser"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv"; + type = "gem"; + }; + version = "1.16.0"; + }; + rubocop-discourse = { + dependencies = ["rubocop" "rubocop-rspec"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01f4y7am9cq276zl8vsgv64w8wfmhpbzg7vzsifhgnnh92g6s04g"; + type = "gem"; + }; + version = "2.5.0"; + }; + rubocop-rspec = { + dependencies = ["rubocop"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "051gq9pz49iv4gq34d3n089iaa6cb418n2fhin6gd6fpysbi3nf6"; + type = "gem"; + }; + version = "2.9.0"; + }; + ruby-progressbar = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; + type = "gem"; + }; + version = "1.11.0"; + }; + unicode-display_width = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn"; + type = "gem"; + }; + version = "2.1.0"; + }; +} diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix index e4624104179b..372899afd8e0 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ b/nixpkgs/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 = "6534ceb4529f86499b4a77300c851a7f69f016e0"; - sha256 = "sha256-25vVNH9HRddDTiwqPtFo2JdE1Fo3hNMjXn5GMWA1jzs="; + rev = "a16d5edd386f4099064753a4eed72ecb9c1bb1a8"; + sha256 = "sha256-9Fuu/UFmU4Gpkm5cRKOgDK0bt7nD545X18wtue+IrN8="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-openid-connect"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile index 63a7cf62749b..9753a02ce094 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile @@ -3,4 +3,5 @@ source "https://rubygems.org" # gem "rails" -gem 'prometheus_exporter', File.read(File.expand_path("../prometheus_exporter_version", __FILE__)).strip +gem "webrick", "1.7.0" +gem "prometheus_exporter", File.read(File.expand_path("../prometheus_exporter_version", __FILE__)).strip diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock index 79978e387cb9..25e4e031c01f 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock @@ -1,13 +1,16 @@ GEM remote: https://rubygems.org/ specs: - prometheus_exporter (0.5.0) + prometheus_exporter (2.0.6) + webrick + webrick (1.7.0) PLATFORMS ruby DEPENDENCIES - prometheus_exporter (= 0.5.0) + prometheus_exporter (= 2.0.6) + webrick (= 1.7.0) BUNDLED WITH - 2.3.9 + 2.4.10 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index 07c942303e7f..b5c2ef7c6e84 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -6,8 +6,8 @@ src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "e8caf83e0bcbb55effb86e99324aa15259f608cc"; - sha256 = "sha256-X3VU4TUth/6j/x9hVpw2GLRZHDCnDfxLbveZUQrFfVU="; + rev = "802cb5aa89838ecb3078dbe21b70d87b1675d89e"; + sha256 = "sha256-tgujK/k/7l/9dAFna5sfUpgP0PVfjk+aGRbqZ70lmRw="; }; patches = [ diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/gemset.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/gemset.nix index e62e01926837..b6f3158174c1 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/gemset.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/gemset.nix @@ -1,12 +1,23 @@ { prometheus_exporter = { + dependencies = ["webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kmabnxz466zqnyqlzc693ny4l7i0rxvmc0znswvizc0zg4pri80"; + sha256 = "0pb4k6px8b36bvnw3d14j31s33ns60dcwxixbcgvhpzavd7fparb"; type = "gem"; }; - version = "0.5.0"; + version = "2.0.6"; + }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; }; } diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/no-git-version.patch b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/no-git-version.patch index 416386f4ecd3..9aebfd8aa794 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/no-git-version.patch +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/no-git-version.patch @@ -2,7 +2,7 @@ diff --git a/lib/internal_metric/global.rb b/lib/internal_metric/global.rb index 682571b..7bdd431 100644 --- a/lib/internal_metric/global.rb +++ b/lib/internal_metric/global.rb -@@ -30,30 +30,7 @@ module DiscoursePrometheus::InternalMetric +@@ -30,28 +30,7 @@ module DiscoursePrometheus::InternalMetric @active_app_reqs = 0 @queued_app_reqs = 0 @fault_logged = {} @@ -10,7 +10,7 @@ index 682571b..7bdd431 100644 - begin - @@version = nil - -- out, error, status = Open3.capture3('git rev-parse HEAD') +- out, error, status = Open3.capture3("git rev-parse HEAD") - - if status.success? - @@version ||= out.chomp @@ -26,9 +26,7 @@ index 682571b..7bdd431 100644 - - @@retries ||= 10 - @@retries -= 1 -- if @@retries < 0 -- @@version = -1 -- end +- @@version = -1 if @@retries < 0 - end + @@version = -1 end diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/prometheus_exporter_version b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/prometheus_exporter_version index 8f0916f768f0..157e54f3e4d5 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/prometheus_exporter_version +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/prometheus_exporter_version @@ -1 +1 @@ -0.5.0 +2.0.6 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix new file mode 100644 index 000000000000..28505b6f40b5 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix @@ -0,0 +1,17 @@ +{ lib, mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-reactions"; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-reactions"; + rev = "01aca15b2774c088f3673118e92e9469f37d2fb6"; + sha256 = "sha256-txQ1G2pBcl4bMBwv3vTs9dwBGKp2uEBvK7BuqQ1O8xg="; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-reactions"; + maintainers = with maintainers; [ bbenno ]; + license = licenses.mit; + description = "Allows users to react to a post from a choice of emojis, rather than only the like heart"; + }; +} diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix index ad9c2f91c837..c92e54d4c43d 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix +++ b/nixpkgs/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 = "836981c3d5c51353165a2dad05de5054fe7a1b77"; - sha256 = "sha256-UisVi+JKZovge0SFFlgxX4WXLOtWKX/RDMVR7Vrc8so="; + rev = "5c6d1b6c186c5c96bb92bd6de62d3bc2da6a5b68"; + sha256 = "sha256-Z9wWwf9gH/Iainxx089J4eT7MpQeHpFXgTU40p/IcYY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-saved-searches"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index 5eaf0e18a6a6..2e393f5c59c8 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "e6cce5486df906ede74aa1b17ab308a145a99b88"; - sha256 = "sha256-hgoCPMlE5qJbdftwOW/zRcp8C7S0h/W2XrfFjLrNpgw="; + rev = "29a991e60f3ca3bb44d382d675e4458794a683f3"; + sha256 = "sha256-6flXuGA7SdIlGLYzyY5AXzQF/cEs39XfeptoBia8SHw="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix index 6b0a203c232f..c5fa6f823951 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ b/nixpkgs/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 = "a1e4d543e1bafeb11cbb9d09a887ce210b7eecb8"; - sha256 = "sha256-lZUT+ix1mLomeIdYIOz1vgY6sLVSPOhM85/FkXZFfWc="; + rev = "0ee68da1fe1d029685a373df7fc874fcd2e50991"; + sha256 = "sha256-z+0RL7HAJ92TyI1z2DBpirYN7IWzV7iGejs8Howo2+s="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-spoiler-alert"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix index ea5c172e6141..6574cece9505 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-voting"; - rev = "b6118e9e50a2bec6bbb995db235657c7097bfaa9"; - sha256 = "sha256-dXJS5ZcyBstE8mSTukUDg0H1ytEJs679wvVuojoUPY4="; + rev = "d9cab9664263e75d46533fb83586ce88cb2b6cfe"; + sha256 = "sha256-cKbsc2ZPXaU4CAzM+oqwbs93l3NMrOGw4IBZLVZIDyw="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-voting"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index bd4dbc6bd137..fa9158395042 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/nixpkgs/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 = "76b35ac9b20725250140602e5d12a82b31383d35"; - sha256 = "sha256-RtmnRXh8AbKSe+kuBcORv5FcKYez7WU2owcW16LFCns="; + rev = "af7e294d04ca7b0c64dd604d19a553500accee51"; + sha256 = "sha256-ioUJqLe/sUDKKa106hGY4OhwOgC+96YFQ4Lqr/CFF7Y="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-yearly-review"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index b2116cc8ac3e..72cc4660cb0f 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -1,51 +1,51 @@ # frozen_string_literal: true -source 'https://rubygems.org' +source "https://rubygems.org" # if there is a super emergency and rubygems is playing up, try #source 'http://production.cf.rubygems.org' -gem 'bootsnap', require: false, platform: :mri +gem "bootsnap", require: false, platform: :mri def rails_master? - ENV["RAILS_MASTER"] == '1' + ENV["RAILS_MASTER"] == "1" end if rails_master? - gem 'arel', git: 'https://github.com/rails/arel.git' - gem 'rails', git: 'https://github.com/rails/rails.git' + gem "arel", git: "https://github.com/rails/arel.git" + gem "rails", git: "https://github.com/rails/rails.git" else # NOTE: Until rubygems gives us optional dependencies we are stuck with this needing to be explicit # this allows us to include the bits of rails we use without pieces we do not. # # To issue a rails update bump the version number here - rails_version = '7.0.3.1' - gem 'actionmailer', rails_version - gem 'actionpack', rails_version - gem 'actionview', rails_version - gem 'activemodel', rails_version - gem 'activerecord', rails_version - gem 'activesupport', rails_version - gem 'railties', rails_version - gem 'sprockets-rails' + rails_version = "7.0.4.3" + gem "actionmailer", rails_version + gem "actionpack", rails_version + gem "actionview", rails_version + gem "activemodel", rails_version + gem "activerecord", rails_version + gem "activesupport", rails_version + gem "railties", rails_version + gem "sprockets-rails" end -gem 'json' +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' +# We intend to drop sprockets rather than upgrade to 4.x +gem "sprockets", git: "https://github.com/rails/sprockets", branch: "3.x" # this will eventually be added to rails, # allows us to precompile all our templates in the unicorn master -gem 'actionview_precompiler', require: false +gem "actionview_precompiler", require: false -gem 'seed-fu' +gem "discourse-seed-fu" -gem 'mail', git: 'https://github.com/discourse/mail.git' -gem 'mini_mime' -gem 'mini_suffix' +gem "mail" +gem "mini_mime" +gem "mini_suffix" -gem 'redis' +gem "redis" # This is explicitly used by Sidekiq and is an optional dependency. # We tell Sidekiq to use the namespace "sidekiq" which triggers this @@ -53,222 +53,229 @@ gem 'redis' # redis namespace support is optional # We already namespace stuff in DiscourseRedis, so we should consider # just using a single implementation in core vs having 2 namespace implementations -gem 'redis-namespace' +gem "redis-namespace" # NOTE: AM serializer gets a lot slower with recent updates # we used an old branch which is the fastest one out there # are long term goal here is to fork this gem so we have a # better maintained living fork -gem 'active_model_serializers', '~> 0.8.3' +gem "active_model_serializers", "~> 0.8.3" -gem 'http_accept_language', require: false +gem "http_accept_language", require: false -# Ember related gems need to be pinned cause they control client side -# behavior, we will push these versions up when upgrading ember -gem 'discourse-ember-rails', '0.18.6', require: 'ember-rails' -gem 'discourse-ember-source', '~> 3.12.2' -gem 'ember-handlebars-template', '0.8.0' -gem 'discourse-fonts', require: 'discourse_fonts' +gem "discourse-fonts", require: "discourse_fonts" -gem 'barber' +gem "message_bus" -gem 'message_bus' +gem "rails_multisite" -gem 'rails_multisite' +gem "fast_xs", platform: :ruby -gem 'fast_xs', platform: :ruby +gem "fastimage" -gem 'xorcist' +gem "aws-sdk-s3", require: false +gem "aws-sdk-sns", require: false +gem "excon", require: false +gem "unf", require: false -gem 'fastimage' +gem "email_reply_trimmer" -gem 'aws-sdk-s3', require: false -gem 'aws-sdk-sns', require: false -gem 'excon', require: false -gem 'unf', require: false +gem "image_optim" +gem "multi_json" +gem "mustache" +gem "nokogiri" +gem "loofah" +gem "css_parser", require: false -gem 'email_reply_trimmer' +gem "omniauth" +gem "omniauth-facebook" +gem "omniauth-twitter" +gem "omniauth-github" -gem 'image_optim' -gem 'multi_json' -gem 'mustache' -gem 'nokogiri' -gem 'loofah' -gem 'css_parser', require: false +gem "omniauth-oauth2", require: false -gem 'omniauth' -gem 'omniauth-facebook' -gem 'omniauth-twitter' -gem 'omniauth-github' +gem "omniauth-google-oauth2" -gem 'omniauth-oauth2', require: false +# pending: https://github.com/ohler55/oj/issues/789 +gem "oj", "3.13.14" -gem 'omniauth-google-oauth2' +gem "pg" +gem "mini_sql" +gem "pry-rails", require: false +gem "pry-byebug", require: false +gem "rtlcss", require: false +gem "rake" -# pending: https://github.com/ohler55/oj/issues/789 -gem 'oj', '3.13.14' - -gem 'pg' -gem 'mini_sql' -gem 'pry-rails', require: false -gem 'pry-byebug', require: false -gem 'r2', require: false -gem 'rake' - -gem 'thor', require: false -gem 'diffy', require: false -gem 'rinku' -gem 'sidekiq' -gem 'mini_scheduler' - -gem 'execjs', require: false -gem 'mini_racer' - -gem 'highline', require: false - -gem 'rack' - -gem 'rack-protection' # security -gem 'cbor', require: false -gem 'cose', require: false -gem 'addressable' -gem 'json_schemer' - -if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.1") - # net-smtp, net-imap and net-pop were removed from default gems in Ruby 3.1 - gem "net-smtp", "~> 0.2.1", require: false - gem "net-imap", "~> 0.2.1", require: false - gem "net-pop", "~> 0.1.1", require: false - gem "digest", "3.0.0", require: false -end +gem "thor", require: false +gem "diffy", require: false +gem "rinku" +gem "sidekiq" +gem "mini_scheduler" + +gem "execjs", require: false +gem "mini_racer" + +gem "highline", require: false + +gem "rack" + +gem "rack-protection" # security +gem "cbor", require: false +gem "cose", require: false +gem "addressable" +gem "json_schemer" + +gem "net-smtp", require: false +gem "net-imap", require: false +gem "net-pop", require: false +gem "digest", require: false # Gems used only for assets and not required in production environments by default. # Allow everywhere for now cause we are allowing asset debugging in production group :assets do - gem 'uglifier' + gem "uglifier" end group :test do - gem 'webmock', require: false - gem 'fakeweb', require: false - gem 'minitest', require: false - gem 'simplecov', require: false + gem "capybara", require: false + gem "webmock", require: false + gem "fakeweb", require: false + gem "minitest", require: false + gem "simplecov", require: false + gem "selenium-webdriver", require: false gem "test-prof" + gem "webdrivers", require: false end group :test, :development do - gem 'rspec' - gem 'listen', require: false - gem 'certified', require: false - gem 'fabrication', require: false - gem 'mocha', require: false + gem "rspec" + gem "listen", require: false + gem "certified", require: false + gem "fabrication", require: false + gem "mocha", require: false + + gem "rb-fsevent", require: RUBY_PLATFORM =~ /darwin/i ? "rb-fsevent" : false - gem 'rb-fsevent', require: RUBY_PLATFORM =~ /darwin/i ? 'rb-fsevent' : false + gem "rspec-rails" - gem 'rspec-rails' + gem "shoulda-matchers", require: false + gem "rspec-html-matchers" + gem "byebug", require: ENV["RM_INFO"].nil?, platform: :mri + gem "rubocop-discourse", require: false + gem "parallel_tests" - gem 'shoulda-matchers', require: false - gem 'rspec-html-matchers' - gem 'byebug', require: ENV['RM_INFO'].nil?, platform: :mri - gem 'rubocop-discourse', require: false, github: 'discourse/rubocop-discourse' - gem 'parallel_tests' + gem "rswag-specs" - gem 'rswag-specs' + gem "annotate" - gem 'annotate' + gem "syntax_tree" + gem "syntax_tree-disable_ternary" end group :development do - gem 'ruby-prof', require: false, platform: :mri - gem 'bullet', require: !!ENV['BULLET'] - gem 'better_errors', platform: :mri, require: !!ENV['BETTER_ERRORS'] - gem 'binding_of_caller' - gem 'yaml-lint' + gem "ruby-prof", require: false, platform: :mri + gem "bullet", require: !!ENV["BULLET"] + gem "better_errors", platform: :mri, require: !!ENV["BETTER_ERRORS"] + gem "binding_of_caller" + gem "yaml-lint" + gem "yard" end if ENV["ALLOW_DEV_POPULATE"] == "1" - gem 'discourse_dev_assets' - gem 'faker', "~> 2.16" + gem "discourse_dev_assets" + gem "faker", "~> 2.16" else group :development, :test do - gem 'discourse_dev_assets' - gem 'faker', "~> 2.16" + gem "discourse_dev_assets" + gem "faker", "~> 2.16" end end # this is an optional gem, it provides a high performance replacement # to String#blank? a method that is called quite frequently in current # ActiveRecord, this may change in the future -gem 'fast_blank', platform: :ruby +gem "fast_blank", platform: :ruby # this provides a very efficient lru cache -gem 'lru_redux' +gem "lru_redux" -gem 'htmlentities', require: false +gem "htmlentities", require: false # IMPORTANT: mini profiler monkey patches, so it better be required last # If you want to amend mini profiler to do the monkey patches in the railties # we are open to it. by deferring require to the initializer we can configure discourse installs without it -gem 'rack-mini-profiler', require: ['enable_rails_patches'] +gem "rack-mini-profiler", require: ["enable_rails_patches"] -gem 'unicorn', require: false, platform: :ruby -gem 'puma', require: false -gem 'rbtrace', require: false, platform: :mri -gem 'gc_tracer', require: false, platform: :mri +gem "unicorn", require: false, platform: :ruby +gem "puma", require: false +gem "rbtrace", require: false, platform: :mri +gem "gc_tracer", require: false, platform: :mri # required for feed importing and embedding -gem 'ruby-readability', require: false +gem "ruby-readability", require: false # rss gem is a bundled gem from Ruby 3 onwards -gem 'rss', require: false +gem "rss", require: false -gem 'stackprof', require: false, platform: :mri -gem 'memory_profiler', require: false, platform: :mri +gem "stackprof", require: false, platform: :mri +gem "memory_profiler", require: false, platform: :mri -gem 'cppjieba_rb', require: false +gem "cppjieba_rb", require: false -gem 'lograge', require: false -gem 'logstash-event', require: false -gem 'logstash-logger', require: false -gem 'logster' +gem "lograge", require: false +gem "logstash-event", require: false +gem "logstash-logger", require: false +gem "logster" -# NOTE: later versions of sassc are causing a segfault, possibly dependent on processer architecture -# and until resolved should be locked at 2.0.1 -gem 'sassc', '2.0.1', require: false -gem "sassc-rails" +# These are forks of sassc and sassc-rails with dart-sass support +gem "dartsass-ruby" +gem "dartsass-sprockets" -gem 'rotp', require: false +gem "rotp", require: false -gem 'rqrcode' +gem "rqrcode" -gem 'rubyzip', require: false +gem "rubyzip", require: false -gem 'sshkey', require: false +gem "sshkey", require: false -gem 'rchardet', require: false -gem 'lz4-ruby', require: false, platform: :ruby +gem "rchardet", require: false +gem "lz4-ruby", require: false, platform: :ruby -gem 'sanitize' +gem "sanitize" if ENV["IMPORT"] == "1" - gem 'mysql2' - gem 'redcarpet' + gem "mysql2" + gem "redcarpet" # NOTE: in import mode the version of sqlite can matter a lot, so we stick it to a specific one - gem 'sqlite3', '~> 1.3', '>= 1.3.13' - gem 'ruby-bbcode-to-md', git: 'https://github.com/nlalonde/ruby-bbcode-to-md' - gem 'reverse_markdown' - gem 'tiny_tds' - gem 'csv' + gem "sqlite3", "~> 1.3", ">= 1.3.13" + gem "ruby-bbcode-to-md", git: "https://github.com/nlalonde/ruby-bbcode-to-md" + gem "reverse_markdown" + gem "tiny_tds" + gem "csv" + + gem "parallel", require: false end -gem 'webpush', require: false -gem 'colored2', require: false -gem 'maxminddb' +gem "web-push" +gem "colored2", require: false +gem "maxminddb" + +gem "rails_failover", require: false -gem 'rails_failover', require: false +gem "faraday" +gem "faraday-retry" # workaround for faraday-net_http, see # https://github.com/ruby/net-imap/issues/16#issuecomment-803086765 -gem 'net-http' +gem "net-http" + +# workaround for prometheus-client +gem "webrick", require: false + +# Workaround until Ruby ships with cgi version 0.3.6 or higher. +gem "cgi", ">= 0.3.6", require: false + +gem "tzinfo-data" diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 95c706acab3f..22bf3b726468 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -1,40 +1,34 @@ GIT - remote: https://github.com/discourse/mail.git - revision: 5b700fc95ee66378e0cf2559abc73c8bc3062a4b + remote: https://github.com/rails/sprockets + revision: f4d3dae71ef29c44b75a49cfbf8032cce07b423a + branch: 3.x specs: - mail (2.8.0.edge) - mini_mime (>= 0.1.1) - -GIT - remote: https://github.com/discourse/rubocop-discourse.git - revision: a5aea6e5f150b1eb7765a805bec0ff618cb718b3 - specs: - rubocop-discourse (2.5.0) - rubocop (>= 1.1.0) - rubocop-rspec (>= 2.0.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) GEM remote: https://rubygems.org/ specs: - actionmailer (7.0.3.1) - actionpack (= 7.0.3.1) - actionview (= 7.0.3.1) - activejob (= 7.0.3.1) - activesupport (= 7.0.3.1) + actionmailer (7.0.4.3) + actionpack (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activesupport (= 7.0.4.3) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.3.1) - actionview (= 7.0.3.1) - activesupport (= 7.0.3.1) + actionpack (7.0.4.3) + actionview (= 7.0.4.3) + activesupport (= 7.0.4.3) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.3.1) - activesupport (= 7.0.3.1) + actionview (7.0.4.3) + activesupport (= 7.0.4.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -43,21 +37,21 @@ GEM actionview (>= 6.0.a) active_model_serializers (0.8.4) activemodel (>= 3.0) - activejob (7.0.3.1) - activesupport (= 7.0.3.1) + activejob (7.0.4.3) + activesupport (= 7.0.4.3) globalid (>= 0.3.6) - activemodel (7.0.3.1) - activesupport (= 7.0.3.1) - activerecord (7.0.3.1) - activemodel (= 7.0.3.1) - activesupport (= 7.0.3.1) - activesupport (7.0.3.1) + activemodel (7.0.4.3) + activesupport (= 7.0.4.3) + activerecord (7.0.4.3) + activemodel (= 7.0.4.3) + activesupport (= 7.0.4.3) + activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.4) + public_suffix (>= 2.0.2, < 6.0) annotate (3.2.0) activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) @@ -81,51 +75,62 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.5.0) aws-eventstream (~> 1, >= 1.0.2) - barber (0.12.2) - ember-source (>= 1.0, < 3.1) - execjs (>= 1.2, < 3) better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.13.0) + bootsnap (1.16.0) msgpack (~> 1.2) builder (3.2.4) - bullet (7.0.2) + bullet (7.0.7) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) + capybara (3.39.0) + addressable + matrix + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (>= 1.5, < 3.0) + xpath (~> 3.2) cbor (0.5.9.6) certified (1.0.0) + cgi (0.3.6) chunky_png (1.4.0) coderay (1.1.3) colored2 (3.1.2) - concurrent-ruby (1.1.10) - connection_pool (2.2.5) - cose (1.2.1) + concurrent-ruby (1.2.2) + connection_pool (2.4.0) + cose (1.3.0) cbor (~> 0.5.9) openssl-signature_algorithm (~> 1.0) cppjieba_rb (0.4.2) crack (0.4.5) rexml crass (1.0.6) - css_parser (1.11.0) + css_parser (1.14.0) addressable + dartsass-ruby (3.0.1) + sass-embedded (~> 1.54) + dartsass-sprockets (3.0.0) + dartsass-ruby (~> 3.0) + railties (>= 4.0.0) + sprockets (> 3.0) + sprockets-rails + tilt + date (3.3.3) debug_inspector (1.1.0) diff-lcs (1.5.0) diffy (3.4.2) - digest (3.1.0) - discourse-ember-rails (0.18.6) - active_model_serializers - ember-data-source (>= 1.0.0.beta.5) - ember-handlebars-template (>= 0.1.1, < 1.0) - ember-source (>= 1.1.0) - jquery-rails (>= 1.0.17) - railties (>= 3.1) - discourse-ember-source (3.12.2.3) + digest (3.1.1) discourse-fonts (0.0.9) + discourse-seed-fu (2.3.12) + activerecord (>= 3.1) + activesupport (>= 3.1) discourse_dev_assets (0.0.4) faker (~> 2.16) literate_randomizer @@ -133,86 +138,60 @@ GEM ecma-re-validator (0.4.0) regexp_parser (~> 2.2) email_reply_trimmer (0.1.13) - ember-data-source (3.0.2) - ember-source (>= 2, < 3.0) - ember-handlebars-template (0.8.0) - barber (>= 0.11.0) - sprockets (>= 3.3, < 4.1) - ember-source (2.18.2) - erubi (1.11.0) - excon (0.92.4) + erubi (1.12.0) + excon (0.99.0) execjs (2.8.1) - exifr (1.3.9) + exifr (1.3.10) fabrication (2.30.0) - faker (2.22.0) + faker (2.23.0) i18n (>= 1.8.11, < 2) fakeweb (1.3.0) - faraday (1.10.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) + faraday (2.7.4) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) + faraday-net_http (3.0.2) + faraday-retry (2.1.0) + faraday (~> 2.0) fast_blank (1.0.1) fast_xs (0.8.0) fastimage (2.2.6) ffi (1.15.5) fspath (3.1.2) gc_tracer (1.5.1) - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) + google-protobuf (3.22.3) guess_html_encoding (0.0.11) hana (1.3.7) hashdiff (1.0.1) hashie (5.0.0) - highline (2.0.3) - hkdf (0.3.0) + highline (2.1.0) + hkdf (1.0.0) htmlentities (4.3.4) http_accept_language (2.1.1) i18n (1.12.0) concurrent-ruby (~> 1.0) - image_optim (0.31.1) + image_optim (0.31.3) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (>= 1.5, < 4) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_size (3.0.2) + image_size (3.2.0) in_threads (1.6.0) - jmespath (1.6.1) - jquery-rails (4.5.0) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - json (2.6.2) - json-schema (2.8.1) - addressable (>= 2.4) - json_schemer (0.2.21) + jmespath (1.6.2) + json (2.6.3) + json-schema (3.0.0) + addressable (>= 2.8) + json_schemer (0.2.23) ecma-re-validator (~> 0.3) hana (~> 1.3) regexp_parser (~> 2.0) uri_template (~> 0.7) - jwt (2.4.1) + jwt (2.7.0) kgio (2.11.4) libv8-node (16.10.0.0) - listen (3.7.1) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) literate_randomizer (0.4.0) @@ -224,62 +203,68 @@ GEM logstash-event (1.2.02) logstash-logger (0.26.1) logstash-event (~> 1.2) - logster (2.11.2) - loofah (2.18.0) + logster (2.12.2) + loofah (2.20.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) lz4-ruby (0.3.3) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + matrix (0.4.2) maxminddb (0.1.22) - memory_profiler (1.0.0) - message_bus (4.2.0) + memory_profiler (1.0.1) + message_bus (4.3.2) rack (>= 1.1.3) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.8.0) - mini_racer (0.6.2) + mini_portile2 (2.8.1) + mini_racer (0.6.3) libv8-node (~> 16.10.0.0) - mini_scheduler (0.14.0) - sidekiq (>= 4.2.3) + mini_scheduler (0.15.0) + sidekiq (>= 4.2.3, < 7.0) mini_sql (1.4.0) mini_suffix (0.3.3) ffi (~> 1.9) - minitest (5.16.2) - mocha (1.14.0) - msgpack (1.5.4) + minitest (5.18.0) + mocha (2.0.2) + ruby2_keywords (>= 0.0.5) + msgpack (1.7.0) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.2.3) mustache (1.1.1) - net-http (0.2.2) + net-http (0.3.2) uri - net-imap (0.2.3) - digest + net-imap (0.3.4) + date net-protocol - strscan - net-pop (0.1.1) - digest + net-pop (0.1.2) net-protocol + net-protocol (0.2.1) timeout - net-protocol (0.1.3) - timeout - net-smtp (0.3.1) - digest + net-smtp (0.3.3) net-protocol - timeout - nio4r (2.5.8) - nokogiri (1.13.8) + nio4r (2.5.9) + nokogiri (1.14.3) mini_portile2 (~> 2.8.0) racc (~> 1.4) - oauth (0.5.10) - oauth2 (1.4.7) - faraday (>= 0.8, < 2.0) + oauth (1.1.0) + oauth-tty (~> 1.0, >= 1.0.1) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + oauth-tty (1.0.5) + version_gem (~> 1.1, >= 1.1.1) + oauth2 (1.4.11) + faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) + rack (>= 1.2, < 4) oj (3.13.14) - omniauth (1.9.1) + omniauth (1.9.2) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) omniauth-facebook (9.0.0) @@ -295,66 +280,66 @@ GEM omniauth-oauth (1.2.0) oauth omniauth (>= 1.0, < 3) - omniauth-oauth2 (1.7.2) - oauth2 (~> 1.4) + omniauth-oauth2 (1.7.3) + oauth2 (>= 1.4, < 3) omniauth (>= 1.9, < 3) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - openssl (3.0.0) - openssl-signature_algorithm (1.2.1) - openssl (> 2.0, < 3.1) + openssl (3.1.0) + openssl-signature_algorithm (1.3.0) + openssl (> 2.0) optimist (3.0.1) parallel (1.22.1) - parallel_tests (3.11.1) + parallel_tests (4.2.0) parallel - parser (3.1.2.1) + parser (3.2.2.0) ast (~> 2.4.1) - pg (1.4.3) + pg (1.4.6) + prettier_print (1.2.1) progress (3.6.0) - pry (0.13.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.9.0) + pry-byebug (3.10.1) byebug (~> 11.0) - pry (~> 0.13.0) + pry (>= 0.13, < 0.15) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.7) - puma (5.6.4) + public_suffix (5.0.1) + puma (6.2.1) nio4r (~> 2.0) - r2 (0.2.7) - racc (1.6.0) - rack (2.2.4) - rack-mini-profiler (3.0.0) + racc (1.6.2) + rack (2.2.6.4) + rack-mini-profiler (3.1.0) rack (>= 1.2.0) - rack-protection (2.2.2) + rack-protection (3.0.6) rack - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - rails_failover (0.8.1) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + rails_failover (1.0.0) activerecord (> 6.0, < 7.1) concurrent-ruby railties (> 6.0, < 7.1) rails_multisite (4.0.1) activerecord (> 5.0, < 7.1) railties (> 5.0, < 7.1) - railties (7.0.3.1) - actionpack (= 7.0.3.1) - activesupport (= 7.0.3.1) + railties (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - raindrops (0.20.0) + raindrops (0.20.1) rake (13.0.6) - rb-fsevent (0.11.1) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rbtrace (0.4.14) @@ -362,176 +347,198 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rchardet (1.8.0) - redis (4.7.1) - redis-namespace (1.8.2) - redis (>= 3.0.4) - regexp_parser (2.5.0) + redis (4.8.1) + redis-namespace (1.10.0) + redis (>= 4) + regexp_parser (2.8.0) request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) rinku (2.0.6) - rotp (6.2.0) + rotp (6.2.2) rqrcode (2.1.2) chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.1) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) + rspec-support (~> 3.12.0) rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.11.1) + rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-rails (5.1.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.11.0) + rspec-support (~> 3.12.0) + rspec-rails (6.0.1) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.11) + rspec-expectations (~> 3.11) + rspec-mocks (~> 3.11) + rspec-support (~> 3.11) + rspec-support (3.12.0) rss (0.2.9) rexml - rswag-specs (2.5.1) + rswag-specs (2.8.0) activesupport (>= 3.1, < 7.1) - json-schema (~> 2.2) + json-schema (>= 2.2, < 4.0) railties (>= 3.1, < 7.1) - rubocop (1.34.1) + rspec-core (>= 2.14) + rtlcss (0.2.0) + mini_racer (~> 0.6.3) + rubocop (1.50.2) json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.0, < 2.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) - parser (>= 3.1.1.0) - rubocop-rspec (2.12.1) - rubocop (~> 1.31) - ruby-prof (1.4.3) - ruby-progressbar (1.11.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.28.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.17.1) + rubocop (~> 1.41) + rubocop-discourse (3.2.0) + rubocop (>= 1.1.0) + rubocop-rspec (>= 2.0.0) + rubocop-rspec (2.19.0) + rubocop (~> 1.33) + rubocop-capybara (~> 2.17) + ruby-prof (1.6.1) + ruby-progressbar (1.13.0) ruby-readability (0.7.0) guess_html_encoding (>= 0.0.4) nokogiri (>= 1.6.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) - sanitize (6.0.0) + sanitize (6.0.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) - sassc (2.0.1) - ffi (~> 1.9) - rake - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt - seed-fu (2.3.9) - activerecord (>= 3.1) - activesupport (>= 3.1) - shoulda-matchers (5.1.0) + sass-embedded (1.62.0) + google-protobuf (~> 3.21) + rake (>= 10.0.0) + selenium-webdriver (4.8.6) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) + shoulda-matchers (5.3.0) activesupport (>= 5.2.0) - sidekiq (6.5.4) - connection_pool (>= 2.2.2) + sidekiq (6.5.8) + connection_pool (>= 2.2.5, < 3) rack (~> 2.0) - redis (>= 4.5.0) - simplecov (0.21.2) + redis (>= 4.5.0, < 5) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) sshkey (2.0.0) - stackprof (0.2.20) - strscan (3.0.4) - test-prof (1.0.9) + stackprof (0.2.25) + syntax_tree (6.1.1) + prettier_print (>= 1.2.0) + syntax_tree-disable_ternary (1.0.0) + test-prof (1.2.1) thor (1.2.1) - tilt (2.0.11) - timeout (0.3.0) - tzinfo (2.0.5) + tilt (2.1.0) + timeout (0.3.2) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) + tzinfo-data (1.2023.3) + tzinfo (>= 1.0.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.2.0) + unicode-display_width (2.4.2) unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) uniform_notifier (1.16.0) - uri (0.11.0) + uri (0.12.1) uri_template (0.7.0) - webmock (3.17.1) + version_gem (1.1.2) + web-push (3.0.0) + hkdf (~> 1.0) + jwt (~> 2.0) + openssl (~> 3.0) + webdrivers (5.2.0) + nokogiri (~> 1.6) + rubyzip (>= 1.3.0) + selenium-webdriver (~> 4.0) + webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webpush (1.1.0) - hkdf (~> 0.2) - jwt (~> 2.0) - xorcist (1.1.3) - yaml-lint (0.0.10) - zeitwerk (2.6.0) + webrick (1.7.0) + websocket (1.2.9) + xpath (3.2.0) + nokogiri (~> 1.8) + yaml-lint (0.1.2) + yard (0.9.34) + zeitwerk (2.6.7) PLATFORMS ruby DEPENDENCIES - actionmailer (= 7.0.3.1) - actionpack (= 7.0.3.1) - actionview (= 7.0.3.1) + actionmailer (= 7.0.4.3) + actionpack (= 7.0.4.3) + actionview (= 7.0.4.3) actionview_precompiler active_model_serializers (~> 0.8.3) - activemodel (= 7.0.3.1) - activerecord (= 7.0.3.1) - activesupport (= 7.0.3.1) + activemodel (= 7.0.4.3) + activerecord (= 7.0.4.3) + activesupport (= 7.0.4.3) addressable annotate aws-sdk-s3 aws-sdk-sns - barber better_errors binding_of_caller bootsnap bullet byebug + capybara cbor certified + cgi (>= 0.3.6) colored2 cose cppjieba_rb css_parser + dartsass-ruby + dartsass-sprockets diffy - discourse-ember-rails (= 0.18.6) - discourse-ember-source (~> 3.12.2) + digest discourse-fonts + discourse-seed-fu discourse_dev_assets email_reply_trimmer - ember-handlebars-template (= 0.8.0) excon execjs fabrication faker (~> 2.16) fakeweb + faraday + faraday-retry fast_blank fast_xs fastimage @@ -550,7 +557,7 @@ DEPENDENCIES loofah lru_redux lz4-ruby - mail! + mail maxminddb memory_profiler message_bus @@ -564,6 +571,9 @@ DEPENDENCIES multi_json mustache net-http + net-imap + net-pop + net-smtp nokogiri oj (= 3.13.14) omniauth @@ -577,13 +587,12 @@ DEPENDENCIES pry-byebug pry-rails puma - r2 rack rack-mini-profiler rack-protection rails_failover rails_multisite - railties (= 7.0.3.1) + railties (= 7.0.4.3) rake rb-fsevent rbtrace @@ -598,30 +607,34 @@ DEPENDENCIES rspec-rails rss rswag-specs - rubocop-discourse! + rtlcss + rubocop-discourse ruby-prof ruby-readability rubyzip sanitize - sassc (= 2.0.1) - sassc-rails - seed-fu + selenium-webdriver shoulda-matchers sidekiq simplecov - sprockets (= 3.7.2) + sprockets! sprockets-rails sshkey stackprof + syntax_tree + syntax_tree-disable_ternary test-prof thor + tzinfo-data uglifier unf unicorn + web-push + webdrivers webmock - webpush - xorcist + webrick yaml-lint + yard BUNDLED WITH - 2.3.9 + 2.4.10 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 95a0d999a981..d407a53befc6 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wdh4av6w6calnvvms6r8w3k3gaw0xy1lgsrjjf5d5gxq09nk7y7"; + sha256 = "112ga1x7y5l0fmammlwajzqxp0fbg1ciw7f6ad9a55wrb0n3hk3y"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.3"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f9y1qjnrwbwab3hf6nzlpr4v1fr1wq39l6dw3i1y3i6n8w04sb5"; + sha256 = "1cb0hqkfkc0b9s7swvi4nf64c24i3ma1gv09anr8a81k56s0rwxd"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.3"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1csycx6zlzrp6pw58s4nkm2qaz720cdhgxjkwjsd0qla75kvsyln"; + sha256 = "1h9027sqzfcbc84dnzw8nxjyg15zrk1y2fc0468wg1xi9nmyw96z"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.3"; }; actionview_precompiler = { dependencies = ["actionview"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03hn978lx6lasac267mincy6wwcir5gyix7gwrbvvk7rg7bsbmbk"; + sha256 = "08xawfj8lkxlfwnmx3f7324w126rli6mqdx9j6ybz2ks9vxz0x3w"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.3"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s9gjs1a49n7rfhz84glw6w62swlrqdqjhs8421kaa72iwxavq16"; + sha256 = "0ymhsxgdb68zgf4zp07g2bymmpgn0b9r38avn9pagz1p5zy1ql9v"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.3"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lb838wvarms8bs8hvfkccdsp4cjc0y9wjsxvw71h4ir3mys4jqg"; + sha256 = "01wb98i2zsbb4jcb4i6z72vb05wiks4hv9chc66h1rsxrv0zi4dv"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.3"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15lbq28v48i6q118p02m5zs9c63y1kv2h5krb3ss6q2vyaxhnfz7"; + sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.4"; }; annotate = { dependencies = ["activerecord" "rake"]; @@ -205,17 +205,6 @@ }; version = "1.5.0"; }; - barber = { - dependencies = ["ember-source" "execjs"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07rnlbh7kgamcbnl1sqlcdrjj8src4qc687klqq4a3vqq2slnscx"; - type = "gem"; - }; - version = "0.12.2"; - }; better_errors = { dependencies = ["coderay" "erubi" "rack"]; groups = ["development"]; @@ -252,10 +241,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y1ycmvyd7swp6gy85m7znwilvb61zzcx6najgq0d1glq0p2hwy6"; + sha256 = "1vcg52gwl64xhhal6kwk1pc01y1klzdlnv1awyk89kb91z010x7q"; type = "gem"; }; - version = "1.13.0"; + version = "1.16.0"; }; builder = { groups = ["default" "development" "test"]; @@ -273,10 +262,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10cwf4pi2i1r1hpz06sishj95aa9m65ymd61sl2vp57ncsrqcyab"; + sha256 = "0hyz68j0z0j24vcrs43swmlykhzypayv34kzrsbxda5lbi83gynm"; type = "gem"; }; - version = "7.0.2"; + version = "7.0.7"; }; byebug = { groups = ["development" "test"]; @@ -292,6 +281,17 @@ }; version = "11.1.3"; }; + capybara = { + dependencies = ["addressable" "matrix" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06b4nlhirsq8ny17s8zgz7qyvl9v41rixj1xkviiiwxlnjz982d3"; + type = "gem"; + }; + version = "3.39.0"; + }; cbor = { groups = ["default"]; platforms = []; @@ -312,6 +312,16 @@ }; version = "1.0.0"; }; + cgi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18zc1z8va9j1gcv131p605wmkvn1p5958mmvvy7v45ki8c0w7qn5"; + type = "gem"; + }; + version = "0.3.6"; + }; chunky_png = { groups = ["default"]; platforms = []; @@ -351,20 +361,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.2"; }; connection_pool = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ffdxhgirgc86qb42yvmfj6v1v0x4lvi0pxn9zhghkff44wzra0k"; + sha256 = "0dndngqvkm2ih3wqn5ilf9980c1cc57lqn5lywx3myalzpilq05z"; type = "gem"; }; - version = "2.2.5"; + version = "2.4.0"; }; cose = { dependencies = ["cbor" "openssl-signature_algorithm"]; @@ -372,10 +382,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cf29s40xf6a9k0idswfbabkswr0k5iqfrg61v40bzfrv0fdg440"; + sha256 = "00c6x4ha7qiaaf88qdbyf240mk146zz78rbm4qwyaxmwlmk7q933"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; cppjieba_rb = { groups = ["default"]; @@ -414,10 +424,42 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; + sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj"; + type = "gem"; + }; + version = "1.14.0"; + }; + dartsass-ruby = { + dependencies = ["sass-embedded"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z3gdsnyvdjgn9gwia72irqgxq04i8hv9pv60yqkd4h5nk9rx4p6"; type = "gem"; }; - version = "1.11.0"; + version = "3.0.1"; + }; + dartsass-sprockets = { + dependencies = ["dartsass-ruby" "railties" "sprockets" "sprockets-rails" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1842k5i96iiz264wzzqar2m3whs2caf0d8yhbsr6qdbi4j5pzmcx"; + type = "gem"; + }; + version = "3.0.0"; + }; + date = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; }; debug_inspector = { groups = ["default" "development"]; @@ -454,41 +496,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00vwzvxgby22h7jhwadqqf9ssbkp3ag2pl4g7q3zf1y8mlk7rk39"; - type = "gem"; - }; - version = "3.1.0"; - }; - discourse-ember-rails = { - dependencies = ["active_model_serializers" "ember-data-source" "ember-handlebars-template" "ember-source" "jquery-rails" "railties"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ax5x2d6q6hkm7r58ai9p0sahlg842aqlm7dpv6svrfpnjlaz7sf"; + sha256 = "01qkpbkxq83ip3iysfh2kjrg9sh2n2q91prhyxh3vq10lcfzv9l1"; type = "gem"; }; - version = "0.18.6"; + version = "3.1.1"; }; - discourse-ember-source = { + discourse-fonts = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q4wypjiqvjlwaif5z3pnv0z02rsiysx58d7iljrw8xx9sxwxn6x"; + sha256 = "1q1q9fmqc7dir2nj94nai58h26zsh6fqmbr6hfax5d6xpy4pm1yf"; type = "gem"; }; - version = "3.12.2.3"; + version = "0.0.9"; }; - discourse-fonts = { + discourse-seed-fu = { + dependencies = ["activerecord" "activesupport"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1q9fmqc7dir2nj94nai58h26zsh6fqmbr6hfax5d6xpy4pm1yf"; + sha256 = "1r3mbi72cx3xx8dnva1zhvxcacdma4xfn16d8s860m7d25fdjqag"; type = "gem"; }; - version = "0.0.9"; + version = "2.3.12"; }; discourse_dev_assets = { dependencies = ["faker" "literate_randomizer"]; @@ -532,38 +564,6 @@ }; version = "0.1.13"; }; - ember-data-source = { - dependencies = ["ember-source"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1803nh3knvwl12h63jd48qvbbrp42yy291wcb35960daklip0fd8"; - type = "gem"; - }; - version = "3.0.2"; - }; - ember-handlebars-template = { - dependencies = ["barber" "sprockets"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wxj3vi4xs3vjxrdbzi4j4w6vv45r5dkz2rg2ldid3p8dp3irlf4"; - type = "gem"; - }; - version = "0.8.0"; - }; - ember-source = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sixy30ym9j2slhlr0lfq943g958w8arlb0lsizh59iv1w5gmxxy"; - type = "gem"; - }; - version = "2.18.2"; - }; erubi = { groups = ["default" "development" "test"]; platforms = [{ @@ -573,20 +573,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cdc76kgr4f1mq4jwbmq1qvr9c15hb4r1cx4dvrdra13vy9sckb5"; + sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09"; type = "gem"; }; - version = "0.92.4"; + version = "0.99.0"; }; execjs = { groups = ["assets" "default"]; @@ -603,10 +603,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mylhwmh6n4xihxr9s3zj0lc286f5maxbqd4dgk3paqnd7afz88s"; + sha256 = "08fmmswa9fwymwsa2gzlm856ak3y9kjxdzm4zdrcrfyxs2p8yqwc"; type = "gem"; }; - version = "1.3.9"; + version = "1.3.10"; }; fabrication = { groups = ["development" "test"]; @@ -624,10 +624,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1na8p9r9zdvz75aihjczhamlygrjs9dj7pcbxgg8vfavrx8d89b5"; + sha256 = "1wslw5gh335zcahxmdd497xaa7h0d8l60c0jfv942mn47fxy8m47"; type = "gem"; }; - version = "2.22.0"; + version = "2.23.0"; }; fakeweb = { groups = ["test"]; @@ -640,116 +640,36 @@ version = "1.3.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"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; - type = "gem"; - }; - version = "1.10.0"; - }; - faraday-em_http = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-em_synchrony = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-excon = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; - type = "gem"; - }; - version = "1.1.0"; - }; - faraday-httpclient = { + dependencies = ["faraday-net_http" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj"; type = "gem"; }; - version = "1.0.1"; - }; - faraday-multipart = { - dependencies = ["multipart-post"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; - type = "gem"; - }; - version = "1.0.4"; + version = "2.7.4"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; - type = "gem"; - }; - version = "1.0.1"; - }; - faraday-net_http_persistent = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; - type = "gem"; - }; - version = "1.2.0"; - }; - faraday-patron = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; + sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; type = "gem"; }; - version = "1.0.0"; - }; - faraday-rack = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; - type = "gem"; - }; - version = "1.0.0"; + version = "3.0.2"; }; faraday-retry = { + dependencies = ["faraday"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; + sha256 = "1zz0w4jpfa6h1wlirfcs9hzvlpijnd1nnmjq94w5yv50585p279n"; type = "gem"; }; - version = "1.0.3"; + version = "2.1.0"; }; fast_blank = { groups = ["default"]; @@ -837,10 +757,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n5yc058i8xhi1fwcp1w7mfi6xaxfmrifdb4r4hjfff33ldn8lqj"; + sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; + }; + google-protobuf = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xcg53yz44cqhcpb85w3ay80kvnniy0v441c9p08wb6zzia2mnq9"; + type = "gem"; + }; + version = "3.22.3"; }; guess_html_encoding = { groups = ["default"]; @@ -887,20 +817,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; + sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.0"; }; hkdf = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04fixg0a51n4vy0j6c1hvisa2yl33m3jrrpxpb5sq6j511vjriil"; + sha256 = "03g3yvfnlcjv2qw3b3yahg0x7zhwcd1bwxyj6gbn5jrc7k4kfrqg"; type = "gem"; }; - version = "0.3.0"; + version = "1.0.0"; }; htmlentities = { groups = ["default"]; @@ -939,20 +869,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l3n59w1cbvfg2srfa14g3jdqwbkf7l86g4qrgfz3qps7zi0drg7"; + sha256 = "02iw1plldayr1l8bdw2gshq0h083h0fxwji1m1nfhzikz917c07p"; type = "gem"; }; - version = "0.31.1"; + version = "0.31.3"; }; image_size = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "033k72f8n28psm89wv1qwsrnqyzz57ihyivyi442wha6vr9iyjz3"; + sha256 = "10slvvyam8gkdjzlhb3wb21hp46ay18miyh1advwvyny660rmdsb"; type = "gem"; }; - version = "3.0.2"; + version = "3.2.0"; }; in_threads = { groups = ["default"]; @@ -969,31 +899,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; - type = "gem"; - }; - version = "1.6.1"; - }; - jquery-rails = { - dependencies = ["rails-dom-testing" "railties" "thor"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fdbln0w43n2b2kwhmm6w302iydgkd2hvw8pp0hnj0dykmy9vf54"; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; type = "gem"; }; - version = "4.5.0"; + version = "1.6.2"; }; json = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl"; + sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; type = "gem"; }; - version = "2.6.2"; + version = "2.6.3"; }; json-schema = { dependencies = ["addressable"]; @@ -1001,10 +920,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yv5lfmr2nzd14af498xqd5p89f3g080q8wk0klr3vxgypsikkb5"; + sha256 = "0gdvm83yaa5n8hwapwzxwfcmbypiq2i0zfx4mzz67wg55p2cnli4"; type = "gem"; }; - version = "2.8.1"; + version = "3.0.0"; }; json_schemer = { dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"]; @@ -1012,20 +931,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11dsw41f1zai3k8kxxjhmjlycwg67irqaqmiw4jbw12wdc6cxa6d"; + sha256 = "1a5y4xh2w31plcx779jghbjgp1hf3wpwkdmcaa4na6ck8sknw4i2"; type = "gem"; }; - version = "0.2.21"; + version = "0.2.23"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lsk71qh5d7bm1qqrjvcwhp4h71ckkdbzxnw4xkd9cin8gjfvvr6"; + sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p"; type = "gem"; }; - version = "2.4.1"; + version = "2.7.0"; }; kgio = { groups = ["default"]; @@ -1059,10 +978,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v"; + sha256 = "13rgkfar8pp31z1aamxf5y7cfq88wv6rxxcwy7cmm177qq508ycn"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.0"; }; literate_randomizer = { groups = ["default" "development"]; @@ -1111,10 +1030,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15kcv5agmash3szsl4aj5ns4daxp439w8czw0fvq4qgf92y4fi8s"; + sha256 = "18yqcf756rzxdq5pw2qrximfryv15ib7rv2g622wjig7zhvk8wx4"; type = "gem"; }; - version = "2.11.2"; + version = "2.12.2"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1122,10 +1041,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; + sha256 = "1mi4ia13fisc97fzd8xcd9wkjdki7zfbmdn1xkdzplicir68gyp8"; type = "gem"; }; - version = "2.18.0"; + version = "2.20.0"; }; lru_redux = { groups = ["default"]; @@ -1154,17 +1073,25 @@ version = "0.3.3"; }; mail = { - dependencies = ["mini_mime"]; + dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; groups = ["default"]; platforms = []; source = { - fetchSubmodules = false; - rev = "5b700fc95ee66378e0cf2559abc73c8bc3062a4b"; - sha256 = "0j084s1gsdwiqvm4jdayi0x4rsdrazqv8z8wkz28v7zmaymw18lz"; - type = "git"; - url = "https://github.com/discourse/mail.git"; + remotes = ["https://rubygems.org"]; + sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; + type = "gem"; }; - version = "2.8.0.edge"; + version = "2.8.1"; + }; + matrix = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; + type = "gem"; + }; + version = "0.4.2"; }; maxminddb = { groups = ["default"]; @@ -1185,10 +1112,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s8qaf19yr4lhvdxk3cy3ifc47cgxdz2jybg6hzxsy9gh88c1f7v"; + sha256 = "1c81d68r4wx0ckbmqxlfqc2qpd94jwcmqdm0xgr0s46r48pv9k9q"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; message_bus = { dependencies = ["rack"]; @@ -1196,10 +1123,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15gazkvbqffh57if68j2p81pm52ww7j9wibbqpq8xp7c3gxqahgq"; + sha256 = "07acv6l89b1c0d3dfq84jb0vzbv489agcw60n7rnvk10y4x58bn5"; type = "gem"; }; - version = "4.2.0"; + version = "4.3.2"; }; method_source = { groups = ["default" "development" "test"]; @@ -1226,10 +1153,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; mini_racer = { dependencies = ["libv8-node"]; @@ -1237,10 +1164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jf9qjz3r06asz14b6f3z7f2y437a1viqfp52sdi71ipj7dk70bs"; + sha256 = "0i4vbb1549rxbl8a35yaizfkbh28nxby5mcwri5mz3x19yg3p6r8"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.3"; }; mini_scheduler = { dependencies = ["sidekiq"]; @@ -1248,10 +1175,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g8mi0l90kkdvh45xz1gcmv3yzpj7d4dvgrhk8lg7lwn82d06yzw"; + sha256 = "11ng6hgb13jddharcnkcx6v2ycbfz1nx0n8i88n06pa29lfqgqrn"; type = "gem"; }; - version = "0.14.0"; + version = "0.15.0"; }; mini_sql = { groups = ["default"]; @@ -1279,20 +1206,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; + sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; type = "gem"; }; - version = "5.16.2"; + version = "5.18.0"; }; mocha = { + dependencies = ["ruby2_keywords"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ffd7zn24lwhp3xp747jfg4zxgqbm04ar7shhjy2iv5xg1pz01lr"; + sha256 = "03bgnshh84hrw6f1sdj5srxnz0z50m0a7i93fa28fkbm52c2a1lg"; type = "gem"; }; - version = "1.14.0"; + version = "2.0.2"; }; msgpack = { groups = ["default"]; @@ -1303,10 +1231,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02af38s49111wglqzcjcpa7bwg6psjgysrjvgk05h3x4zchb6gd5"; + sha256 = "172ky0r1jfcm3xyg067pia7k1lhc15vw9svv93max120gcdbrvji"; type = "gem"; }; - version = "1.5.4"; + version = "1.7.0"; }; multi_json = { groups = ["default"]; @@ -1328,16 +1256,6 @@ }; version = "0.6.0"; }; - multipart-post = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; - type = "gem"; - }; - version = "2.2.3"; - }; mustache = { groups = ["default"]; platforms = []; @@ -1354,32 +1272,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j4f0wgyps0qyms4p6fjqva63xy13wvy7bx5qg5gmzzwm3kqs1fr"; + sha256 = "0y55ib1v2b8prqfi9ij7hca60b1j94s2bzr6vskwi3i5735472wq"; type = "gem"; }; - version = "0.2.2"; + version = "0.3.2"; }; net-imap = { - dependencies = ["digest" "net-protocol" "strscan"]; + dependencies = ["date" "net-protocol"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rl79ykmxa2k4dlk6ykrb9l0a4h101q1gd8c4qv3cl0p9h68zmbn"; + sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; type = "gem"; }; - version = "0.2.3"; + version = "0.3.4"; }; net-pop = { - dependencies = ["digest" "net-protocol" "timeout"]; + dependencies = ["net-protocol"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1slsl3xlbf0cqzmf2q1rfqbm61xvxzmr0h9zprwlbm1xn1cvn9xb"; + sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; type = "gem"; }; - version = "0.1.1"; + version = "0.1.2"; }; net-protocol = { dependencies = ["timeout"]; @@ -1387,31 +1305,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "051cc82dl41a66c9sxv4lx4slqk7sz1v4iy0hdk6gpjyjszf4hxd"; + sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; type = "gem"; }; - version = "0.1.3"; + version = "0.2.1"; }; net-smtp = { - dependencies = ["digest" "net-protocol" "timeout"]; + dependencies = ["net-protocol"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s358kfv9mnfxcjbpr1d5a2gs1q7wkw7ffpn86mf1b3s9p31bw9s"; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.3"; }; nio4r = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f"; type = "gem"; }; - version = "2.5.8"; + version = "2.5.9"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -1419,20 +1337,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0fnw0z8zl8b5k35g9m5hhc1g4s6ajzjinhyxnqjrx7l7p07fw71v"; type = "gem"; }; - version = "1.13.8"; + version = "1.14.3"; }; oauth = { + dependencies = ["oauth-tty" "snaky_hash" "version_gem"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1syx3hfimaqycy21kn8gmal1cb3bw3hzalv3in2ixnay1xzjp41q"; + type = "gem"; + }; + version = "1.1.0"; + }; + oauth-tty = { + dependencies = ["version_gem"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1asrxrbgzgzf1r9rb0c785zyyaq9v5z7v3k1avsais2sh9q1y763"; + sha256 = "05wb5n36i4h23hh9dx2m2cwjxx5vj0vgyrn2xr6rsl54glq5rqil"; type = "gem"; }; - version = "0.5.10"; + version = "1.0.5"; }; oauth2 = { dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; @@ -1440,10 +1370,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q6q2kgpxmygk8kmxqn54zkw8cs57a34zzz5cxpsh1bj3ag06rk3"; + sha256 = "042w5lamxhllfxsv0y8v9cvdhmlasy5kxbhcdd3lzj9bhz4gqfb7"; type = "gem"; }; - version = "1.4.7"; + version = "1.4.11"; }; oj = { groups = ["default"]; @@ -1461,10 +1391,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz"; + sha256 = "1jn9j54l5h7xcba2vjq74l1dk0xrwvsjxam4qhylpi52nw0h5502"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; omniauth-facebook = { dependencies = ["omniauth-oauth2"]; @@ -1516,10 +1446,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ry65f309rnzhgdjvqybkd5i4qp9rpk1gbp4dz02h4l6bkk6ya10"; + sha256 = "0ia73zcbmhf02krlkq2rxmksx93jp777ax5x58fzkq3jzacqyniz"; type = "gem"; }; - version = "1.7.2"; + version = "1.7.3"; }; omniauth-twitter = { dependencies = ["omniauth-oauth" "rack"]; @@ -1537,10 +1467,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1azzx975qr078isvg8i0hmsr2l98kgnlfrnbb2jdm9b5kwifx1h4"; + sha256 = "0c649921vg2l939z5cc3jwd8p1v49099pdhxfk7sb9qqx5wi5873"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.0"; }; openssl-signature_algorithm = { dependencies = ["openssl"]; @@ -1548,10 +1478,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rwjga70kbg0rmwgksb2if34ndh9cy0fgrimkx3hjz9c68ssvpxg"; + sha256 = "103yjl68wqhl5kxaciir5jdnyi7iv9yckishdr52s5knh9g0pd53"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; optimist = { groups = ["default"]; @@ -1583,10 +1513,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jgqdwfgd4g3mfi854f2n0v615z3n59l24nya7v6cdnaixn5x02y"; + sha256 = "11lf8vsh6kxzp7k3xzkxdmb31b01phaz5z8a7sjpq9hh6ab30k8l"; type = "gem"; }; - version = "3.11.1"; + version = "4.2.0"; }; parser = { dependencies = ["ast"]; @@ -1594,20 +1524,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; + sha256 = "0s5afi89p76k8vpwiqvh343pm5l23ijqlpszhz65afym3zpkxhzx"; type = "gem"; }; - version = "3.1.2.1"; + version = "3.2.2.0"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb"; + sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.6"; + }; + prettier_print = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ybgks9862zmlx71zd4j20ky86fsrp6j6m0az4hzzb1zyaskha57"; + type = "gem"; + }; + version = "1.2.1"; }; progress = { groups = ["default"]; @@ -1625,10 +1565,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk"; + sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4"; type = "gem"; }; - version = "0.13.1"; + version = "0.14.2"; }; pry-byebug = { dependencies = ["byebug" "pry"]; @@ -1636,10 +1576,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "096y5vmzpyy4x9h4ky4cs4y7d19vdq9vbwwrqafbh5gagzwhifiv"; + sha256 = "1y41al94ks07166qbp2200yzyr5y60hm7xaiw4lxpgsm4b1pbyf8"; type = "gem"; }; - version = "3.9.0"; + version = "3.10.1"; }; pry-rails = { dependencies = ["pry"]; @@ -1657,10 +1597,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.1"; }; puma = { dependencies = ["nio4r"]; @@ -1668,30 +1608,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw"; - type = "gem"; - }; - version = "5.6.4"; - }; - r2 = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wk0p55zp3l96xy5ps28b33dn5z0jwsjl74bwfdn6z81pzjs5sfk"; + sha256 = "0qqd5lb3mamh53ssx0xavmspg4blhq6hd1kipksw20bq71xcklf5"; type = "gem"; }; - version = "0.2.7"; + version = "6.2.1"; }; racc = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.2"; }; rack = { groups = ["default" "development" "test"]; @@ -1702,10 +1632,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; + sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk"; type = "gem"; }; - version = "2.2.4"; + version = "2.2.6.4"; }; rack-mini-profiler = { dependencies = ["rack"]; @@ -1713,10 +1643,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "121fqk18x1bd52c2bkz8wkvv9nkgpqphj5aycnb7lkf67jkwic0h"; + sha256 = "13dhpp1iljhqp9c8akmp6gjhx47qf83w12ns4bif26ldkignpam1"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.0"; }; rack-protection = { dependencies = ["rack"]; @@ -1724,10 +1654,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "169jzzgvbjrqmz4q55wp9pg4ji2h90mggcdxy152gv5vp96l2hgx"; + sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8"; type = "gem"; }; - version = "2.2.2"; + version = "3.0.6"; }; rack-test = { dependencies = ["rack"]; @@ -1735,10 +1665,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; + sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -1757,10 +1687,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; + sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; type = "gem"; }; - version = "1.4.3"; + version = "1.5.0"; }; rails_failover = { dependencies = ["activerecord" "concurrent-ruby" "railties"]; @@ -1768,10 +1698,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "145m778yylgrjl2q7zfkq35l5sibyynlx6pyp176ifm146gbf9wf"; + sha256 = "1j0zi64m9njfgk4xs4invqlimkgiy4fsivfmbpz33bg0w5yyzazi"; type = "gem"; }; - version = "0.8.1"; + version = "1.0.0"; }; rails_multisite = { dependencies = ["activerecord" "railties"]; @@ -1790,10 +1720,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnrhx0sdixz5xm2vi482ngs4alh8l725kh96v6mfk0x0qlbdsaw"; + sha256 = "0w6pib1s0kmfnhjvxwh48flz7w4gy8y961n821w8by7d1g83vjwq"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.3"; }; rainbow = { groups = ["default" "development" "test"]; @@ -1816,10 +1746,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wb2x51parf6v78w0cic90m33bdc92y5h8rj4wqs75dhw1b69hc7"; + sha256 = "0c27mcglrj928zkm4d2spj9yh2xkkka8ns5s6bidkwild3zvj3ma"; type = "gem"; }; - version = "0.20.0"; + version = "0.20.1"; }; rake = { groups = ["default" "development" "test"]; @@ -1836,10 +1766,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06c50pvxib7wqnv6q0f3n7gzfcrp5chi3sa48hxpkfxc3hhy11fm"; + sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; type = "gem"; }; - version = "0.11.1"; + version = "0.11.2"; }; rb-inotify = { dependencies = ["ffi"]; @@ -1882,10 +1812,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xid9av3apfz5mszwqgl6v0n58g6038lsfdz0p53xb9ywpa5dcpc"; + sha256 = "0fikjg6j12ka6hh36dxzhfkpqqmilzjfzcdf59iwkzsgd63f0ziq"; type = "gem"; }; - version = "4.7.1"; + version = "4.8.1"; }; redis-namespace = { dependencies = ["redis"]; @@ -1893,20 +1823,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ndj4lcm8rw01078zr0249grsk93zbda8qsibdvlx69b5ijg1rzf"; + sha256 = "154dfnrjpbv7fhwhfrcnp6jn9qv5qaj3mvlvbgkl7qy5qsknw71c"; type = "gem"; }; - version = "1.8.2"; + version = "1.10.0"; }; regexp_parser = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; + sha256 = "17xizkw5ryw8hhq64iqxmzdrrdxpc5lhkqc1fgm1aj0zsk1r2950"; type = "gem"; }; - version = "2.5.0"; + version = "2.8.0"; }; request_store = { dependencies = ["rack"]; @@ -1944,10 +1874,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11q7rkjx40yi6lpylgl2jkpy162mjw7mswrcgcax86vgpbpjx6i3"; + sha256 = "10mmzc85y7andsich586ndykw678qn1ns2wpjxrg0sc0gr4w3pig"; type = "gem"; }; - version = "6.2.0"; + version = "6.2.2"; }; rqrcode = { dependencies = ["chunky_png" "rqrcode_core"]; @@ -1976,10 +1906,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19dyb6rcvgi9j2mksd29wfdhfdyzqk7yjhy1ai77559hbhpg61w9"; + sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.0"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -1987,10 +1917,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "118hkfw9b11hvvalr7qlylwal5h8dihagm9xg7k4gskg7587hca6"; + sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.1"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -1998,10 +1928,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "001ihayil7jpfxdlxlhakvz02kx0nk5m1w0bz6z8izdx0nc8bh53"; + sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.2"; }; rspec-html-matchers = { dependencies = ["nokogiri" "rspec"]; @@ -2020,10 +1950,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm"; + sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2"; type = "gem"; }; - version = "3.11.1"; + version = "3.12.5"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -2031,20 +1961,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cqw7bhj4a4rhh1x9i5gjm9r91ckhjyngw0zcr7jw2jnfis10d7l"; + sha256 = "0d3fnabkaw8n0na2dpnlg2xygggj51djzpj9x6y5rkiqbfyqwv01"; type = "gem"; }; - version = "5.1.2"; + version = "6.0.1"; }; rspec-support = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xfk4pla77251n39zf4n792m1rhg5sn1kp63yvpvvysany34la03"; + sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.0"; }; rss = { dependencies = ["rexml"]; @@ -2058,15 +1988,26 @@ version = "0.2.9"; }; rswag-specs = { - dependencies = ["activesupport" "json-schema" "railties"]; + dependencies = ["activesupport" "json-schema" "railties" "rspec-core"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00gm5qbf56shi655hwxzas74avsfv8b91v6i8v06i4jdw8y4qky2"; + sha256 = "0fsxj0dfnncfnx7v9p4pzwp95wpc57cn0bijn0wx3b0pd68i6zhj"; type = "gem"; }; - version = "2.5.1"; + version = "2.8.0"; + }; + rtlcss = { + dependencies = ["mini_racer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nnc1qdr4vdr91406ga1nnw5xk27ii2yzk325ixrf2qca3zl213k"; + type = "gem"; + }; + version = "0.2.0"; }; rubocop = { dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -2074,10 +2015,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n08wns7qaxja8g5fnixicybj1rdq3cjli33l7v1856saizp9lpf"; + sha256 = "0l46lw5gfj3mcm982wpmx7br4rs466gyislv0hfwcsk8dxhv1zkw"; type = "gem"; }; - version = "1.34.1"; + version = "1.50.2"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2085,34 +2026,43 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg"; + sha256 = "0n2gsafg6p7nr1z8i1hkvp2qqkkbg842ba183dnl0h08xd9ms6q5"; + type = "gem"; + }; + version = "1.28.0"; + }; + rubocop-capybara = { + dependencies = ["rubocop"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pz52ml0qbxgcjlmp8y0wsq8xy398n6ypkbrwfaa8zb0v7pscj6n"; type = "gem"; }; - version = "1.21.0"; + version = "2.17.1"; }; rubocop-discourse = { dependencies = ["rubocop" "rubocop-rspec"]; groups = ["development" "test"]; platforms = []; source = { - fetchSubmodules = false; - rev = "a5aea6e5f150b1eb7765a805bec0ff618cb718b3"; - sha256 = "1h25i2ykp1m0j07ij0gq2p632ri01lnykwl3lcishmxncddcz247"; - type = "git"; - url = "https://github.com/discourse/rubocop-discourse.git"; + remotes = ["https://rubygems.org"]; + sha256 = "1jfpi8wd6gxd626kp27n20ja1yj68478dqbc1fiyzj4mr8nw8nsl"; + type = "gem"; }; - version = "2.5.0"; + version = "3.2.0"; }; rubocop-rspec = { - dependencies = ["rubocop"]; + dependencies = ["rubocop" "rubocop-capybara"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y93hhhcs2j7z8gz8xagwwjs243rskryx4fm62piq9i58lnx4y4j"; + sha256 = "1k8yh0nzlz0g8igmj5smnxq71qmi2b005nkl25wkpjkwvzn2wfdx"; type = "gem"; }; - version = "2.12.1"; + version = "2.19.0"; }; ruby-prof = { groups = ["development"]; @@ -2123,20 +2073,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r3xalp91l07m0cwllcxjzg6nkviiqnxkcbgg5qnzsdji6rgy65m"; + sha256 = "106i9m62a20xaipp3vsq4rsnggddfgdvb8xqhvi264slvmac85zq"; type = "gem"; }; - version = "1.4.3"; + version = "1.6.1"; }; ruby-progressbar = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; + sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; type = "gem"; }; - version = "1.11.0"; + version = "1.13.0"; }; ruby-readability = { dependencies = ["guess_html_encoding" "nokogiri"]; @@ -2175,43 +2125,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zq8pxmsd1abw18zz6mazsm2jfpwmbgdxbpawb7bmwvkb2c5yyc1"; + sha256 = "1ga8yzc9zj45m92ycwnzhzahkwvc3dp3lym5m3f3880hs4jhh7l3"; type = "gem"; }; - version = "6.0.0"; + version = "6.0.1"; }; - sassc = { - dependencies = ["ffi" "rake"]; + sass-embedded = { + dependencies = ["google-protobuf" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4"; + sha256 = "1fprlazlld0yr4g8aq9qh4lxjxpvzl2s3fp8f9ydwsrchzj95rbh"; type = "gem"; }; - version = "2.0.1"; - }; - sassc-rails = { - dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d9djmwn36a5m8a83bpycs48g8kh1n2xkyvghn7dr6zwh4wdyksz"; - type = "gem"; - }; - version = "2.1.2"; + version = "1.62.0"; }; - seed-fu = { - dependencies = ["activerecord" "activesupport"]; - groups = ["default"]; + selenium-webdriver = { + dependencies = ["rexml" "rubyzip" "websocket"]; + groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y7lzcshsq6i20qn1p8zczir4fivr6nbl1km91ns320vvh92v43d"; + sha256 = "1hfaz3srv9c420jkmhr19fmdisnjylwpwyjsr8fsw2ggw35ryhrz"; type = "gem"; }; - version = "2.3.9"; + version = "4.8.6"; }; shoulda-matchers = { dependencies = ["activesupport"]; @@ -2219,10 +2158,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01svmyma958sbqfz0v29lbqbr0ibvgcng352nhx6bsc9k5c207d0"; + sha256 = "11igjgh16dl5pwqizdmclzlzpv7mbmnh8fx7m9b5kfsjhwxqdfpn"; type = "gem"; }; - version = "5.1.0"; + version = "5.3.0"; }; sidekiq = { dependencies = ["connection_pool" "rack" "redis"]; @@ -2230,10 +2169,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zyq0faxkrk9jxqchzjlazpycjh8fg33h84qi654yv9c7a146r2z"; + sha256 = "1z2fx4fzgnw4rzj3h1h4sk6qbkp7p2rdr58b2spxgkcsdzg0i5hh"; type = "gem"; }; - version = "6.5.4"; + version = "6.5.8"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -2241,10 +2180,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; + sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; type = "gem"; }; - version = "0.21.2"; + version = "0.22.0"; }; simplecov-html = { groups = ["default" "test"]; @@ -2266,15 +2205,28 @@ }; version = "0.1.4"; }; - sprockets = { - dependencies = ["concurrent-ruby" "rack"]; + snaky_hash = { + dependencies = ["hashie" "version_gem"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + sha256 = "0cfwvdcr46pk0c7m5aw2w3izbrp1iba0q7l21r37mzpwaz0pxj0s"; type = "gem"; }; + version = "2.0.1"; + }; + sprockets = { + dependencies = ["concurrent-ruby" "rack"]; + groups = ["default"]; + platforms = []; + source = { + fetchSubmodules = false; + rev = "f4d3dae71ef29c44b75a49cfbf8032cce07b423a"; + sha256 = "0ps1zb411nrwih0rdp6vrnx0n4n18jcwks2x06iw52gvswlv49ry"; + type = "git"; + url = "https://github.com/rails/sprockets"; + }; version = "3.7.2"; }; sprockets-rails = { @@ -2307,30 +2259,41 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "17ih8nb2v4adihb8fihmja72f55dm0ds92j8asadsjm9mpci4bgc"; + sha256 = "0bhdgfb0pmw9mav1kw9fn0ka012sa0i3h5ppvqssw5xq48nhxnr8"; type = "gem"; }; - version = "0.2.20"; + version = "0.2.25"; }; - strscan = { - groups = ["default"]; + syntax_tree = { + dependencies = ["prettier_print"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "162m5xhbiq315bncp49ziddws537dv09pqsgrzsrmhhsymhgy0zb"; + type = "gem"; + }; + version = "6.1.1"; + }; + syntax_tree-disable_ternary = { + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00ip0m5ad5ywkj4na07qxcyi9wgdh6b877s0ibx5al23abzkxak9"; + sha256 = "0gdi6zx4hqpxd81zas3dlw1jrdp98fvsqj4p7f42x5lhpfzz04zc"; type = "gem"; }; - version = "3.0.4"; + version = "1.0.0"; }; test-prof = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xxw3w131mymawr94zkw5y5wgywix53rakfm0bq8s9ccqdx9mm9v"; + sha256 = "09phq7jxfgamv03kjcgibw0f6w3g3mlb9yapji3bxh7cbjvwk2pa"; type = "gem"; }; - version = "1.0.9"; + version = "1.2.1"; }; thor = { groups = ["default" "development" "test"]; @@ -2347,20 +2310,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; + sha256 = "1qmhi6d9przjzhsyk9g5pq2j75c656msh6xzprqd2mxgphf23jxs"; type = "gem"; }; - version = "2.0.11"; + version = "2.1.0"; }; timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00cy93b6803j3aw5nail4l0zdrj54i5n2dlk6j9z998swcjbv3b2"; + sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; type = "gem"; }; - version = "0.3.0"; + version = "0.3.2"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -2368,10 +2331,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; + type = "gem"; + }; + version = "2.0.6"; + }; + tzinfo-data = { + dependencies = ["tzinfo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m2d0gpsgqnv29j5h2d6g57g0rayvd460b8s2vjr8sn46bqf89m5"; type = "gem"; }; - version = "2.0.5"; + version = "1.2023.3"; }; uglifier = { dependencies = ["execjs"]; @@ -2410,10 +2384,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nlfck6z986fngp0r74maswmyb1rcksc8xc3mfpw9cj23c3s8zwn"; + sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; type = "gem"; }; - version = "2.2.0"; + version = "2.4.2"; }; unicorn = { dependencies = ["kgio" "raindrops"]; @@ -2447,10 +2421,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w00162maixmqp7nwm8mmbvwnnpmjilwbim8yk2ypxy3x3ih6l69"; + sha256 = "1vigw7nfszfqgikr6n574k9bfh0rvs74z8xq46rz2zsm8249l8cc"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.1"; }; uri_template = { groups = ["default"]; @@ -2462,56 +2436,108 @@ }; version = "0.7.0"; }; + version_gem = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dza601x34ln5yvmyaj42gnbij9pifx12frp5vak6n19q9j941r0"; + type = "gem"; + }; + version = "1.1.2"; + }; + web-push = { + dependencies = ["hkdf" "jwt" "openssl"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jsximg9v44rpclhjxp03fxk68jx675pghwxc66wj7rn9h9fc54i"; + type = "gem"; + }; + version = "3.0.0"; + }; + webdrivers = { + dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nxk9719nyk7vsc15mz2hxc8whciihcs40skpn2rncnzsppbv1w3"; + type = "gem"; + }; + version = "5.2.0"; + }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06jbjl78szxkri3wx0mzsdhx2z2af11kp35k5rsrppchbssgagcj"; + sha256 = "1myj44wvbbqvv18ragv3ihl0h61acgnfwrnj3lccdgp49bgmbjal"; type = "gem"; }; - version = "3.17.1"; + version = "3.18.1"; }; - webpush = { - dependencies = ["hkdf" "jwt"]; + webrick = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z9ma580q80czw46gi1bvsr2iwxr63aiyr7i9gilav6hbhg3sxv3"; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; type = "gem"; }; - version = "1.1.0"; + version = "1.7.0"; }; - xorcist = { - groups = ["default"]; + websocket = { + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dbbiy8xlcfvn9ais37xfb5rci4liwakkmxzbkp72wmvlgcrf339"; + sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; type = "gem"; }; - version = "1.1.3"; + version = "1.2.9"; + }; + xpath = { + dependencies = ["nokogiri"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; + type = "gem"; + }; + version = "3.2.0"; }; yaml-lint = { groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m9n4sg7i0334yac7dcrhnhv5rzvrccgnh687n9x77ba3awk4yx1"; + sha256 = "12jc68af2mwdkr9iqay2v6qgq47yk5g82sd171riibk62wbhp5p3"; + type = "gem"; + }; + version = "0.1.2"; + }; + yard = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "013yrnwx1zhzhn1fnc19zck22a1qgimsaglp2iwgf5bz9l8h93js"; type = "gem"; }; - version = "0.0.10"; + version = "0.9.34"; }; zeitwerk = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; + sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1"; type = "gem"; }; - version = "2.6.0"; + version = "2.6.7"; }; } diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch b/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch new file mode 100644 index 000000000000..af9ada13cbe0 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch @@ -0,0 +1,21 @@ +diff --git a/ext/sass/Rakefile b/ext/sass/Rakefile +index 77ced01..1e60ab0 100644 +--- a/ext/sass/Rakefile ++++ b/ext/sass/Rakefile +@@ -18,15 +18,7 @@ file 'protoc.exe' do |t| + end + + file 'sass_embedded' do |t| +- archive = fetch(ENV.fetch(t.name.upcase) { Configuration.default_sass_embedded }) +- unarchive archive +- rm archive +- +- if ENV.key?('NIX_BINTOOLS') +- sh 'patchelf', +- '--set-interpreter', File.read("#{ENV.fetch('NIX_BINTOOLS')}/nix-support/dynamic-linker").chomp, +- (['sass_embedded/src/dart', 'sass_embedded/dart-sass-embedded'].find { |exe| File.exist?(exe) }) +- end ++ symlink(ENV.fetch(t.name.upcase), 'sass_embedded') + end + + file 'embedded.rb' => %w[sass_embedded] do |t| diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/update.py b/nixpkgs/pkgs/servers/web-apps/discourse/update.py index 9fc14b177114..dee31918eac9 100755 --- a/nixpkgs/pkgs/servers/web-apps/discourse/update.py +++ b/nixpkgs/pkgs/servers/web-apps/discourse/update.py @@ -283,6 +283,7 @@ def update_plugins(): """Update plugins to their latest revision.""" plugins = [ {'name': 'discourse-assign'}, + {'name': 'discourse-bbcode-color'}, {'name': 'discourse-calendar'}, {'name': 'discourse-canned-replies'}, {'name': 'discourse-chat-integration'}, @@ -293,8 +294,9 @@ def update_plugins(): {'name': 'discourse-ldap-auth', 'owner': 'jonmbake'}, {'name': 'discourse-math'}, {'name': 'discourse-migratepassword', 'owner': 'discoursehosting'}, - {'name': 'discourse-prometheus'}, {'name': 'discourse-openid-connect'}, + {'name': 'discourse-prometheus'}, + {'name': 'discourse-reactions'}, {'name': 'discourse-saved-searches'}, {'name': 'discourse-solved'}, {'name': 'discourse-spoiler-alert'}, @@ -405,7 +407,9 @@ def update_plugins(): gemfile = rubyenv_dir / "Gemfile" version_file_regex = re.compile(r'.*File\.expand_path\("\.\./(.*)", __FILE__\)') gemfile_text = '' - for line in repo.get_file('plugin.rb', rev).splitlines(): + plugin_file = repo.get_file('plugin.rb', rev) + plugin_file = plugin_file.replace(",\n", ", ") # fix split lines + for line in plugin_file.splitlines(): if 'gem ' in line: line = ','.join(filter(lambda x: ":require_name" not in x, line.split(','))) gemfile_text = gemfile_text + line + os.linesep |