Skip to content

Commit

Permalink
discourse: 2.7.9 -> 2.8.0.beta8, update plugins
Browse files Browse the repository at this point in the history 
fixes #146308
  • Loading branch information
@ryantm
ryantm committed Nov 24, 2021
1 parent 4b67577 commit 3042bd2
Show file tree
Hide file tree
Showing 18 changed files with 456 additions and 374 deletions.
8 changes: 4 additions & 4 deletions pkgs/servers/web-apps/discourse/default.nix
View file
Expand Up @@ -10,13 +10,13 @@
}@args:

let
version = "2.7.9";
version = "2.8.0.beta8";

src = fetchFromGitHub {
owner = "discourse";
repo = "discourse";
rev = "v${version}";
sha256 = "sha256-SOERjFbG4l/tUfOl51XEW0nVbza3L4adjiPhz4Hj0YU=";
sha256 = "sha256-YDPlCspb4T69ofWM74OguSqwsx4X+DGI8axmlPrbGl8=";
};

runtimeDeps = [
Expand Down Expand Up @@ -116,8 +116,8 @@ let
linkFiles = writeShellScript "link-files" ''
cd ../..
mkdir -p vendor/v8/out.gn/libv8/obj/
ln -s "${v8}/lib/libv8.a" vendor/v8/out.gn/libv8/obj/libv8_monolith.a
mkdir -p vendor/v8/x86_64-linux/libv8/obj/
ln -s "${v8}/lib/libv8.a" vendor/v8/x86_64-linux/libv8/obj/libv8_monolith.a
ln -s ${v8}/include vendor/v8/include
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix
View file
Expand Up @@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-assign";
rev = "5124ba0f67e26a075f0a0fc8993273f1211d1c28";
sha256 = "1zd2irp5siza0vd5rlwzmjfvcdfw785988jc526xc741flazk1lr";
rev = "a9a427150edb9e07c5a31ab81f9e983dcf615788";
sha256 = "sha256-KFe0gahtP4HbVlZfbMnyvZeYTNcqkO3HEqDQ6GIm7+Y=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-docs";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock
View file
Expand Up @@ -8,14 +8,14 @@ GEM
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
concurrent-ruby (1.1.9)
i18n (1.8.10)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
minitest (5.14.4)
rrule (0.4.2)
activesupport (>= 4.1)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
zeitwerk (2.4.2)
zeitwerk (2.5.1)

PLATFORMS
ruby
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
View file
Expand Up @@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-calendar";
rev = "2f76cdd3064735d484be1df77f43100aca21aea6";
sha256 = "1skpc8p5br1jkii1rksha1q95ias6xxyvi5bnli3q41w7fz1h5j2";
rev = "716bbebab6d4e43127f0f4711d5058834fae3994";
sha256 = "sha256-WTKH0NCgrSfQlYds1Ge9vQ3ZOeSg+2agk9mgb1Zk/Uk=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-calendar";
Expand Down
8 changes: 4 additions & 4 deletions pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix
View file
Expand Up @@ -26,10 +26,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";
sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf";
type = "gem";
};
version = "1.8.10";
version = "1.8.11";
};
minitest = {
groups = ["default"];
Expand Down Expand Up @@ -68,9 +68,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj";
type = "gem";
};
version = "2.4.2";
version = "2.5.1";
};
}
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix
View file
Expand Up @@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-chat-integration";
rev = "8ade892b387f0ce843d5e78ef4a271b0d35847ff";
sha256 = "1qn1bm09i9gzmh74ws32zgc89hrqzyhmh63qvmv0h00r52rmgxvx";
rev = "369ca147113dbef82aa6577c6ef0f215c6d9c4eb";
sha256 = "sha256-R+mMDvtWaf25YYroLM8kZc1lVcNBGRP7fj/ybNl2pFU=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-chat-integration";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix
View file
Expand Up @@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-checklist";
rev = "48855d81b7c3a3274f7f78a64312125c344d92d1";
sha256 = "0139v5wpyglfzvd07ka6gic1ssfysisgfiq09dsbjy519gnc9kjw";
rev = "d8012abd3d6dccb72eec83e6a96ef4809dcad681";
sha256 = "sha256-I/C+7+d7p1Mc7pNiQWOes/jOmkcSK//CKSyNVAzF8tk=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-checklist";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix
View file
Expand Up @@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-data-explorer";
rev = "23287ece952cb45203819e7b470ebc194c58cb13";
sha256 = "1vc2072r72fkvcfpy6vpn9x4gl9lpjk29pnj8095xs22im8j5in1";
rev = "3ce778ec6d96a300a06ffe0581f4681fbed8df7f";
sha256 = "sha256-S0LQZS1IZmVht4GUdk4wBxq44/BLZYdBXU7GbFWYpZQ=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-data-explorer";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix
View file
Expand Up @@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-docs";
rev = "72cdd8d415ae3f797c0d5e2c857370714a42c54a";
sha256 = "07hvw8lpg8873vhwh8rrbml3s5hq606b7sw93r2xv38gxfhmx5lq";
rev = "d3eee7008b7a703774331808e302e36f2f8b4eae";
sha256 = "sha256-XWehi5tKsfYCVx6IEYjV2JvCH7d/EB0X3fcAsa/Datw=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-docs";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
View file
Expand Up @@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-github";
rev = "9aaf4350968fb758f9bff3588f78e3ad24ddb4b0";
sha256 = "0nmpkh1rr0jv68a655f5610v2mn09xriiqv049a0gklap2lgv7p8";
rev = "8cd8c0703991c16cb2fa8cb1fd22a9c3849c7ae2";
sha256 = "sha256-nWrkb8JNuqTiHUQo8ay3fgsz3fkVEHcldqNqEFQY6p0=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-github";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
View file
Expand Up @@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-math";
rev = "d7d0180352dd5a7dcb76c0817bfbb08c2a0f08c7";
sha256 = "0y72impvnq965ibbfc9877hr78fxkrwav1xmgyy3r9w87952vcwa";
rev = "cacbd04bb239db3c772ff5a37c19fe39d127ff3d";
sha256 = "sha256-Le2NlWcKvI1kFe8Ld92VNzl5a+B0GmiWcC2TRTU/Gq4=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-math";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
View file
Expand Up @@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-solved";
rev = "55cb184f7ef2954326561cc44fc8134798b8a9e0";
sha256 = "0pv5i216zn0v8xfwlndvhvr06vkmxaynj8xjfnc5amy1sp6k76w7";
rev = "40277e50d43e4bdaab99efab44f59f6e33d74740";
sha256 = "sha256-whYIkddzTBznuQ6D5nMbDV/4Bk3JdSMy0pzqxrUxwgo=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-solved";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix
View file
Expand Up @@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-spoiler-alert";
rev = "0b93227ea8e2c72afe72029382081ebff89c3638";
sha256 = "0x0dxb41ss15sv5ph7z7q55ayf8a7r22bgkmr17924mny5440b5a";
rev = "790380d9d321f9368c7a16d8ed87718fc6047bf2";
sha256 = "sha256-SAzHlwd+u1w/vmnl7criohSUxxnrg82JCV0vykUnPB0=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-spoiler-alert";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix
View file
Expand Up @@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-voting";
rev = "fc4d23174eba1a57ddcba93eaf4a4e75d469d4a4";
sha256 = "07mj667qn387kaafg475f36pgnannsrb2bdqi0zj487av43252qb";
rev = "36a41c2969c1ddfd8980e3f766b730b849726a08";
sha256 = "sha256-8JL6qWrOfBiOzhUCCM7310mwfOqfE2LXTKJdHimKQls=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-voting";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
View file
Expand Up @@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-yearly-review";
rev = "cb040562f6af3163d70e8932867b530c6640ab9a";
sha256 = "07h6nq4bafs27ly2f5chkn5vb1wdy909qffwkgp5k1fanhbqvhvs";
rev = "683327574ea1a67c9c4182c887d6ba85171ca02b";
sha256 = "sha256-lahXhT2eysPZSZBjIrG3Ku3dk122HndpJEWkHMXaEHg=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-yearly-review";
Expand Down
45 changes: 30 additions & 15 deletions pkgs/servers/web-apps/discourse/rubyEnv/Gemfile
View file
Expand Up @@ -18,13 +18,14 @@ else
# 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
gem 'actionmailer', '6.1.3.2'
gem 'actionpack', '6.1.3.2'
gem 'actionview', '6.1.3.2'
gem 'activemodel', '6.1.3.2'
gem 'activerecord', '6.1.3.2'
gem 'activesupport', '6.1.3.2'
gem 'railties', '6.1.3.2'
rails_version = '6.1.4.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'
end

Expand Down Expand Up @@ -60,8 +61,6 @@ gem 'redis-namespace'
# better maintained living fork
gem 'active_model_serializers', '~> 0.8.3'

gem 'onebox'

gem 'http_accept_language', require: false

# Ember related gems need to be pinned cause they control client side
Expand Down Expand Up @@ -90,9 +89,7 @@ gem 'unf', require: false

gem 'email_reply_trimmer'

# Forked until https://github.com/toy/image_optim/pull/162 is merged
# https://github.com/discourse/image_optim
gem 'discourse_image_optim', require: 'image_optim'
gem 'image_optim'
gem 'multi_json'
gem 'mustache'
gem 'nokogiri'
Expand All @@ -108,7 +105,10 @@ gem 'omniauth-oauth2', require: false

gem 'omniauth-google-oauth2'

gem 'oj'
# Pinning oj until https://github.com/ohler55/oj/issues/699 is resolved.
# Segfaults and stuck processes after upgrading.
gem 'oj', '3.13.2'

gem 'pg'
gem 'mini_sql'
gem 'pry-rails', require: false
Expand Down Expand Up @@ -169,6 +169,8 @@ group :test, :development do
gem 'parallel_tests'

gem 'rswag-specs'

gem 'annotate'
end

group :development do
Expand All @@ -177,8 +179,16 @@ group :development do
gem 'better_errors', platform: :mri, require: !!ENV['BETTER_ERRORS']
gem 'binding_of_caller'
gem 'yaml-lint'
gem 'annotate'
gem 'discourse_dev'
end

if ENV["ALLOW_DEV_POPULATE"] == "1"
gem 'discourse_dev_assets'
gem 'faker', "~> 2.16"
else
group :development do
gem 'discourse_dev_assets'
gem 'faker', "~> 2.16"
end
end

# this is an optional gem, it provides a high performance replacement
Expand All @@ -205,6 +215,9 @@ gem 'gc_tracer', require: false, platform: :mri
# required for feed importing and embedding
gem 'ruby-readability', require: false

# rss gem is a bundled gem from Ruby 3 onwards
gem 'rss', require: false

gem 'stackprof', require: false, platform: :mri
gem 'memory_profiler', require: false, platform: :mri

Expand All @@ -231,6 +244,8 @@ gem 'sshkey', require: false
gem 'rchardet', require: false
gem 'lz4-ruby', require: false, platform: :ruby

gem 'sanitize'

if ENV["IMPORT"] == "1"
gem 'mysql2'
gem 'redcarpet'
Expand Down

0 comments on commit 3042bd2

Please sign in to comment.