b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

discourse: 2.6.5 -> 2.7.0

Browse source
This commit is contained in:
talyz 2021-05-25 23:16:44 +02:00 committed by Jonathan Ringer
parent 8283538f0f
commit 1f6b48be74
8 changed files with 608 additions and 438 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
nixos/modules/services/web-apps/discourse.nix
View file

@ -398,6 +398,14 @@ in
How OpenSSL checks the certificate, see http://api.rubyonrails.org/classes/ActionMailer/Base.html How OpenSSL checks the certificate, see http://api.rubyonrails.org/classes/ActionMailer/Base.html
''; '';
}; };
forceTLS = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
Force implicit TLS as per RFC 8314 3.3.
'';
};
}; };
incoming = { incoming = {
@ -530,6 +538,7 @@ in
smtp_authentication = cfg.mail.outgoing.authentication; smtp_authentication = cfg.mail.outgoing.authentication;
smtp_enable_start_tls = cfg.mail.outgoing.enableStartTLSAuto; smtp_enable_start_tls = cfg.mail.outgoing.enableStartTLSAuto;
smtp_openssl_verify_mode = cfg.mail.outgoing.opensslVerifyMode; smtp_openssl_verify_mode = cfg.mail.outgoing.opensslVerifyMode;
smtp_force_tls = cfg.mail.outgoing.forceTLS;
load_mini_profiler = true; load_mini_profiler = true;
mini_profiler_snapshots_period = 0; mini_profiler_snapshots_period = 0;
@ -542,8 +551,8 @@ in
redis_host = cfg.redis.host; redis_host = cfg.redis.host;
redis_port = 6379; redis_port = 6379;
redis_slave_host = null; redis_replica_host = null;
redis_slave_port = 6379; redis_replica_port = 6379;
redis_db = cfg.redis.dbNumber; redis_db = cfg.redis.dbNumber;
redis_password = cfg.redis.passwordFile; redis_password = cfg.redis.passwordFile;
redis_skip_client_commands = false; redis_skip_client_commands = false;
@ -552,8 +561,8 @@ in
message_bus_redis_enabled = false; message_bus_redis_enabled = false;
message_bus_redis_host = "localhost"; message_bus_redis_host = "localhost";
message_bus_redis_port = 6379; message_bus_redis_port = 6379;
message_bus_redis_slave_host = null; message_bus_redis_replica_host = null;
message_bus_redis_slave_port = 6379; message_bus_redis_replica_port = 6379;
message_bus_redis_db = 0; message_bus_redis_db = 0;
message_bus_redis_password = null; message_bus_redis_password = null;
message_bus_redis_skip_client_commands = false; message_bus_redis_skip_client_commands = false;
@ -606,6 +615,7 @@ in
allowed_theme_repos = null; allowed_theme_repos = null;
enable_email_sync_demon = false; enable_email_sync_demon = false;
max_digests_enqueued_per_30_mins_per_site = 10000; max_digests_enqueued_per_30_mins_per_site = 10000;
cluster_name = null;
}; };
services.redis.enable = lib.mkDefault (cfg.redis.host == "localhost"); services.redis.enable = lib.mkDefault (cfg.redis.host == "localhost");
@ -667,6 +677,7 @@ in
environment = cfg.package.runtimeEnv // { environment = cfg.package.runtimeEnv // {
UNICORN_TIMEOUT = builtins.toString cfg.unicornTimeout; UNICORN_TIMEOUT = builtins.toString cfg.unicornTimeout;
UNICORN_SIDEKIQS = builtins.toString cfg.sidekiqProcesses; UNICORN_SIDEKIQS = builtins.toString cfg.sidekiqProcesses;
MALLOC_ARENA_MAX = "2";
}; };
preStart = preStart =

2
pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch
View file

@ -1,5 +1,5 @@
diff --git a/config/environments/production.rb b/config/environments/production.rb diff --git a/config/environments/production.rb b/config/environments/production.rb
index 75c3a69512..7fc374cd9d 100644 index a523888a8d..422c2c1ee8 100644
--- a/config/environments/production.rb --- a/config/environments/production.rb
+++ b/config/environments/production.rb +++ b/config/environments/production.rb
@@ -32,6 +32,7 @@ Discourse::Application.configure do @@ -32,6 +32,7 @@ Discourse::Application.configure do

50
pkgs/servers/web-apps/discourse/default.nix
View file

@ -1,18 +1,18 @@
{ stdenv, makeWrapper, runCommandNoCC, lib, nixosTests { stdenv, makeWrapper, runCommandNoCC, lib, nixosTests, writeShellScript
, fetchFromGitHub, bundlerEnv, ruby, replace, gzip, gnutar, git , fetchFromGitHub, bundlerEnv, ruby, replace, gzip, gnutar, git, cacert
, util-linux, gawk, imagemagick, optipng, pngquant, libjpeg, jpegoptim , util-linux, gawk, imagemagick, optipng, pngquant, libjpeg, jpegoptim
, gifsicle, libpsl, redis, postgresql, which, brotli, procps , gifsicle, libpsl, redis, postgresql, which, brotli, procps
, nodePackages, v8 , nodePackages, v8
}: }:
let let
version = "2.6.5"; version = "2.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse"; repo = "discourse";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-JQUgHxs2Cl2LBpg/6JLhZxje4RmPREL1IPta84kXwPw="; sha256 = "sha256-w26pwGDL2j7qbporUzZATgw7E//E6xwahCbXv35QNnc=";
}; };
runtimeDeps = [ runtimeDeps = [
@ -65,24 +65,38 @@ let
gems = import ./rubyEnv/gemset.nix; gems = import ./rubyEnv/gemset.nix;
in in
gems // { gems // {
mini_racer = gems.mini_racer // { libv8-node =
buildInputs = [ v8 ]; let
dontBuild = false; noopScript = writeShellScript "noop" "exit 0";
# The Ruby extension makefile generator assumes the source linkFiles = writeShellScript "link-files" ''
# is C, when it's actually C++ ¯\_(ツ)_/¯ cd ../..
postPatch = ''
substituteInPlace ext/mini_racer_extension/extconf.rb \ mkdir -p vendor/v8/out.gn/libv8/obj/
--replace '" -std=c++0x"' \ ln -s "${v8}/lib/libv8.a" vendor/v8/out.gn/libv8/obj/libv8_monolith.a
'" -x c++ -std=c++0x"'
''; ln -s ${v8}/include vendor/v8/include
};
mkdir -p ext/libv8-node
echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml
'';
in gems.libv8-node // {
dontBuild = false;
postPatch = ''
cp ${noopScript} libexec/build-libv8
cp ${noopScript} libexec/build-monolith
cp ${noopScript} libexec/download-node
cp ${noopScript} libexec/extract-node
cp ${linkFiles} libexec/inject-libv8
'';
};
mini_suffix = gems.mini_suffix // { mini_suffix = gems.mini_suffix // {
propagatedBuildInputs = [ libpsl ]; propagatedBuildInputs = [ libpsl ];
dontBuild = false; dontBuild = false;
# Use our libpsl instead of the vendored one, which isn't # Use our libpsl instead of the vendored one, which isn't
# available for aarch64 # available for aarch64. It has to be called
# libpsl.x86_64.so or it isn't found.
postPatch = '' postPatch = ''
cp $(readlink -f ${libpsl}/lib/libpsl.so) vendor/libpsl.so cp $(readlink -f ${libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so
''; '';
}; };
}; };
@ -111,6 +125,8 @@ let
# run. This means that Redis and PostgreSQL has to be running and # run. This means that Redis and PostgreSQL has to be running and
# database migrations performed. # database migrations performed.
preBuild = '' preBuild = ''
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
redis-server >/dev/null & redis-server >/dev/null &
initdb -A trust $NIX_BUILD_TOP/postgres >/dev/null initdb -A trust $NIX_BUILD_TOP/postgres >/dev/null

10
pkgs/servers/web-apps/discourse/disable_jhead.patch
View file

@ -1,12 +1,12 @@
diff --git a/lib/file_helper.rb b/lib/file_helper.rb diff --git a/lib/file_helper.rb b/lib/file_helper.rb
index 162de9a40b..9ac8807e9d 100644 index d87da5a85e..f5323292d7 100644
--- a/lib/file_helper.rb --- a/lib/file_helper.rb
+++ b/lib/file_helper.rb +++ b/lib/file_helper.rb
@@ -124,6 +124,7 @@ class FileHelper @@ -127,6 +127,7 @@ class FileHelper
jpegoptim: { strip: strip_image_metadata ? "all" : "none" },
jpegtran: false,
jpegrecompress: false, jpegrecompress: false,
# Skip looking for gifsicle, svgo binaries
gifsicle: false,
+ jhead: false, + jhead: false,
svgo: false
) )
end end
end

20
pkgs/servers/web-apps/discourse/rubyEnv/Gemfile
View file

@ -18,13 +18,13 @@ else
# this allows us to include the bits of rails we use without pieces we do not. # 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 # To issue a rails update bump the version number here
gem 'actionmailer', '6.0.3.3' gem 'actionmailer', '6.1.3.2'
gem 'actionpack', '6.0.3.3' gem 'actionpack', '6.1.3.2'
gem 'actionview', '6.0.3.3' gem 'actionview', '6.1.3.2'
gem 'activemodel', '6.0.3.3' gem 'activemodel', '6.1.3.2'
gem 'activerecord', '6.0.3.3' gem 'activerecord', '6.1.3.2'
gem 'activesupport', '6.0.3.3' gem 'activesupport', '6.1.3.2'
gem 'railties', '6.0.3.3' gem 'railties', '6.1.3.2'
gem 'sprockets-rails' gem 'sprockets-rails'
end end
@ -40,7 +40,7 @@ gem 'actionview_precompiler', require: false
gem 'seed-fu' gem 'seed-fu'
gem 'mail', require: false gem 'mail', git: 'https://github.com/discourse/mail.git', require: false
gem 'mini_mime' gem 'mini_mime'
gem 'mini_suffix' gem 'mini_suffix'
@ -96,6 +96,7 @@ gem 'discourse_image_optim', require: 'image_optim'
gem 'multi_json' gem 'multi_json'
gem 'mustache' gem 'mustache'
gem 'nokogiri' gem 'nokogiri'
gem 'loofah'
gem 'css_parser', require: false gem 'css_parser', require: false
gem 'omniauth' gem 'omniauth'
@ -132,6 +133,7 @@ gem 'rack-protection' # security
gem 'cbor', require: false gem 'cbor', require: false
gem 'cose', require: false gem 'cose', require: false
gem 'addressable' gem 'addressable'
gem 'json_schemer'
# Gems used only for assets and not required in production environments by default. # 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 # Allow everywhere for now cause we are allowing asset debugging in production
@ -176,6 +178,7 @@ group :development do
gem 'binding_of_caller' gem 'binding_of_caller'
gem 'yaml-lint' gem 'yaml-lint'
gem 'annotate' gem 'annotate'
gem 'discourse_dev'
end end
# this is an optional gem, it provides a high performance replacement # this is an optional gem, it provides a high performance replacement
@ -192,7 +195,6 @@ gem 'htmlentities', require: false
# If you want to amend mini profiler to do the monkey patches in the railties # 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 # we are open to it. by deferring require to the initializer we can configure discourse installs without it
gem 'flamegraph', require: false
gem 'rack-mini-profiler', require: ['enable_rails_patches'] gem 'rack-mini-profiler', require: ['enable_rails_patches']
gem 'unicorn', require: false, platform: :ruby gem 'unicorn', require: false, platform: :ruby

362
pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
View file

@ -1,21 +1,29 @@
GIT
remote: https://github.com/discourse/mail.git
revision: 5b700fc95ee66378e0cf2559abc73c8bc3062a4b
specs:
mail (2.8.0.edge)
mini_mime (>= 0.1.1)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (6.0.3.3) actionmailer (6.1.3.2)
actionpack (= 6.0.3.3) actionpack (= 6.1.3.2)
actionview (= 6.0.3.3) actionview (= 6.1.3.2)
activejob (= 6.0.3.3) activejob (= 6.1.3.2)
activesupport (= 6.1.3.2)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.0.3.3) actionpack (6.1.3.2)
actionview (= 6.0.3.3) actionview (= 6.1.3.2)
activesupport (= 6.0.3.3) activesupport (= 6.1.3.2)
rack (~> 2.0, >= 2.0.8) rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.0.3.3) actionview (6.1.3.2)
activesupport (= 6.0.3.3) activesupport (= 6.1.3.2)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
@ -24,44 +32,44 @@ GEM
actionview (>= 6.0.a) actionview (>= 6.0.a)
active_model_serializers (0.8.4) active_model_serializers (0.8.4)
activemodel (>= 3.0) activemodel (>= 3.0)
activejob (6.0.3.3) activejob (6.1.3.2)
activesupport (= 6.0.3.3) activesupport (= 6.1.3.2)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.0.3.3) activemodel (6.1.3.2)
activesupport (= 6.0.3.3) activesupport (= 6.1.3.2)
activerecord (6.0.3.3) activerecord (6.1.3.2)
activemodel (= 6.0.3.3) activemodel (= 6.1.3.2)
activesupport (= 6.0.3.3) activesupport (= 6.1.3.2)
activesupport (6.0.3.3) activesupport (6.1.3.2)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 1.6, < 2)
minitest (~> 5.1) minitest (>= 5.1)
tzinfo (~> 1.1) tzinfo (~> 2.0)
zeitwerk (~> 2.2, >= 2.2.2) zeitwerk (~> 2.3)
addressable (2.7.0) addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
annotate (3.1.1) annotate (3.1.1)
activerecord (>= 3.2, < 7.0) activerecord (>= 3.2, < 7.0)
rake (>= 10.4, < 14.0) rake (>= 10.4, < 14.0)
ast (2.4.1) ast (2.4.2)
aws-eventstream (1.1.0) aws-eventstream (1.1.1)
aws-partitions (1.390.0) aws-partitions (1.432.0)
aws-sdk-core (3.109.2) aws-sdk-core (3.112.1)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0) aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
jmespath (~> 1.0) jmespath (~> 1.0)
aws-sdk-kms (1.39.0) aws-sdk-kms (1.42.0)
aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.83.2) aws-sdk-s3 (1.90.0)
aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1) aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-sns (1.35.0) aws-sdk-sns (1.38.0)
aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.2) aws-sigv4 (1.2.3)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
barber (0.12.2) barber (0.12.2)
ember-source (>= 1.0, < 3.1) ember-source (>= 1.0, < 3.1)
@ -70,31 +78,32 @@ GEM
coderay (>= 1.0.0) coderay (>= 1.0.0)
erubi (>= 1.0.0) erubi (>= 1.0.0)
rack (>= 0.9.0) rack (>= 0.9.0)
binding_of_caller (0.8.0) binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
bootsnap (1.5.1) bootsnap (1.7.5)
msgpack (~> 1.0) msgpack (~> 1.0)
builder (3.2.4) builder (3.2.4)
bullet (6.1.0) bullet (6.1.4)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
uniform_notifier (~> 1.11) uniform_notifier (~> 1.11)
byebug (11.1.3) byebug (11.1.3)
cbor (0.5.9.6) cbor (0.5.9.6)
certified (1.0.0) certified (1.0.0)
chunky_png (1.3.14) chunky_png (1.4.0)
coderay (1.1.3) coderay (1.1.3)
colored2 (3.1.2) colored2 (3.1.2)
concurrent-ruby (1.1.7) concurrent-ruby (1.1.8)
connection_pool (2.2.3) connection_pool (2.2.5)
cose (1.2.0) cose (1.2.0)
cbor (~> 0.5.9) cbor (~> 0.5.9)
openssl-signature_algorithm (~> 1.0) openssl-signature_algorithm (~> 1.0)
cppjieba_rb (0.3.3) cppjieba_rb (0.3.3)
crack (0.4.4) crack (0.4.5)
rexml
crass (1.0.6) crass (1.0.6)
css_parser (1.7.1) css_parser (1.9.0)
addressable addressable
debug_inspector (0.0.3) debug_inspector (1.1.0)
diff-lcs (1.4.4) diff-lcs (1.4.4)
diffy (3.4.0) diffy (3.4.0)
discourse-ember-rails (0.18.6) discourse-ember-rails (0.18.6)
@ -104,15 +113,19 @@ GEM
ember-source (>= 1.1.0) ember-source (>= 1.1.0)
jquery-rails (>= 1.0.17) jquery-rails (>= 1.0.17)
railties (>= 3.1) railties (>= 3.1)
discourse-ember-source (3.12.2.2) discourse-ember-source (3.12.2.3)
discourse-fonts (0.0.5) discourse-fonts (0.0.8)
discourse_dev (0.2.1)
faker (~> 2.16)
discourse_image_optim (0.26.2) discourse_image_optim (0.26.2)
exifr (~> 1.2, >= 1.2.2) exifr (~> 1.2, >= 1.2.2)
fspath (~> 3.0) fspath (~> 3.0)
image_size (~> 1.5) image_size (~> 1.5)
in_threads (~> 1.3) in_threads (~> 1.3)
progress (~> 3.0, >= 3.0.1) progress (~> 3.0, >= 3.0.1)
docile (1.3.2) docile (1.4.0)
ecma-re-validator (0.3.0)
regexp_parser (~> 2.0)
email_reply_trimmer (0.1.13) email_reply_trimmer (0.1.13)
ember-data-source (3.0.2) ember-data-source (3.0.2)
ember-source (>= 2, < 3.0) ember-source (>= 2, < 3.0)
@ -121,31 +134,39 @@ GEM
sprockets (>= 3.3, < 4.1) sprockets (>= 3.3, < 4.1)
ember-source (2.18.2) ember-source (2.18.2)
erubi (1.10.0) erubi (1.10.0)
excon (0.78.0) excon (0.81.0)
execjs (2.7.0) execjs (2.8.1)
exifr (1.3.9) exifr (1.3.9)
fabrication (2.21.1) fabrication (2.22.0)
faker (2.17.0)
i18n (>= 1.6, < 2)
fakeweb (1.3.0) fakeweb (1.3.0)
faraday (1.1.0) faraday (1.4.1)
faraday-excon (~> 1.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
ruby2_keywords ruby2_keywords (>= 0.0.4)
faraday-excon (1.1.0)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.1.0)
fast_blank (1.0.0) fast_blank (1.0.0)
fast_xs (0.8.0) fast_xs (0.8.0)
fastimage (2.2.0) fastimage (2.2.3)
ffi (1.13.1) ffi (1.15.0)
flamegraph (0.9.5)
fspath (3.1.2) fspath (3.1.2)
gc_tracer (1.5.1) gc_tracer (1.5.1)
globalid (0.4.2) globalid (0.4.2)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
guess_html_encoding (0.0.11) guess_html_encoding (0.0.11)
hana (1.3.7)
hashdiff (1.0.1) hashdiff (1.0.1)
hashie (4.1.0) hashie (4.1.0)
highline (2.0.3) highline (2.0.3)
hkdf (0.3.0) hkdf (0.3.0)
htmlentities (4.3.4) htmlentities (4.3.4)
http_accept_language (2.1.1) http_accept_language (2.1.1)
i18n (1.8.5) i18n (1.8.10)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
image_size (1.5.0) image_size (1.5.0)
in_threads (1.5.4) in_threads (1.5.4)
@ -154,13 +175,23 @@ GEM
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (2.3.1) json (2.5.1)
json-schema (2.8.1) json-schema (2.8.1)
addressable (>= 2.4) addressable (>= 2.4)
jwt (2.2.2) json_schemer (0.2.18)
ecma-re-validator (~> 0.3)
hana (~> 1.3)
regexp_parser (~> 2.0)
uri_template (~> 0.7)
jwt (2.2.3)
kgio (2.11.3) kgio (2.11.3)
libv8 (8.4.255.0) libv8-node (15.14.0.1)
listen (3.3.1) libv8-node (15.14.0.1-arm64-darwin-20)
libv8-node (15.14.0.1-x86_64-darwin-18)
libv8-node (15.14.0.1-x86_64-darwin-19)
libv8-node (15.14.0.1-x86_64-darwin-20)
libv8-node (15.14.0.1-x86_64-linux)
listen (3.5.1)
rb-fsevent (~> 0.10, >= 0.10.3) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10) rb-inotify (~> 0.9, >= 0.9.10)
lograge (0.11.2) lograge (0.11.2)
@ -171,49 +202,49 @@ GEM
logstash-event (1.2.02) logstash-event (1.2.02)
logstash-logger (0.26.1) logstash-logger (0.26.1)
logstash-event (~> 1.2) logstash-event (~> 1.2)
logster (2.9.4) logster (2.9.6)
loofah (2.8.0) loofah (2.9.1)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
lru_redux (1.1.0) lru_redux (1.1.0)
lz4-ruby (0.3.3) lz4-ruby (0.3.3)
mail (2.7.1)
mini_mime (>= 0.1.1)
maxminddb (0.1.22) maxminddb (0.1.22)
memory_profiler (0.9.14) memory_profiler (1.0.0)
message_bus (3.3.4) message_bus (3.3.5)
rack (>= 1.1.3) rack (>= 1.1.3)
method_source (1.0.0) method_source (1.0.0)
mini_mime (1.0.2) mini_mime (1.1.0)
mini_portile2 (2.4.0) mini_portile2 (2.5.1)
mini_racer (0.3.1) mini_racer (0.4.0)
libv8 (~> 8.4.255) libv8-node (~> 15.14.0.0)
mini_scheduler (0.12.3) mini_scheduler (0.13.0)
sidekiq sidekiq (>= 4.2.3)
mini_sql (0.3) mini_sql (1.1.3)
mini_suffix (0.3.0) mini_suffix (0.3.2)
ffi (~> 1.9) ffi (~> 1.9)
minitest (5.14.2) minitest (5.14.4)
mocha (1.11.2) mocha (1.12.0)
mock_redis (0.26.0) mock_redis (0.28.0)
msgpack (1.3.3) ruby2_keywords
msgpack (1.4.2)
multi_json (1.15.0) multi_json (1.15.0)
multi_xml (0.6.0) multi_xml (0.6.0)
multipart-post (2.1.1) multipart-post (2.1.1)
mustache (1.1.1) mustache (1.1.1)
nio4r (2.5.4) nio4r (2.5.7)
nokogiri (1.10.10) nokogiri (1.11.3)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.5.0)
nokogumbo (2.0.2) racc (~> 1.4)
nokogumbo (2.0.5)
nokogiri (~> 1.8, >= 1.8.4) nokogiri (~> 1.8, >= 1.8.4)
oauth (0.5.4) oauth (0.5.6)
oauth2 (1.4.4) oauth2 (1.4.7)
faraday (>= 0.8, < 2.0) faraday (>= 0.8, < 2.0)
jwt (>= 1.0, < 3.0) jwt (>= 1.0, < 3.0)
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
oj (3.10.16) oj (3.11.5)
omniauth (1.9.1) omniauth (1.9.1)
hashie (>= 3.4.6) hashie (>= 3.4.6)
rack (>= 1.6.2, < 3) rack (>= 1.6.2, < 3)
@ -222,35 +253,38 @@ GEM
omniauth-github (1.4.0) omniauth-github (1.4.0)
omniauth (~> 1.5) omniauth (~> 1.5)
omniauth-oauth2 (>= 1.4.0, < 2.0) omniauth-oauth2 (>= 1.4.0, < 2.0)
omniauth-google-oauth2 (0.8.0) omniauth-google-oauth2 (0.8.2)
jwt (>= 2.0) jwt (>= 2.0)
omniauth (>= 1.1.1) oauth2 (~> 1.1)
omniauth (~> 1.1)
omniauth-oauth2 (>= 1.6) omniauth-oauth2 (>= 1.6)
omniauth-oauth (1.1.0) omniauth-oauth (1.2.0)
oauth oauth
omniauth (~> 1.0) omniauth (>= 1.0, < 3)
omniauth-oauth2 (1.7.0) omniauth-oauth2 (1.7.1)
oauth2 (~> 1.4) oauth2 (~> 1.4)
omniauth (~> 1.9) omniauth (>= 1.9, < 3)
omniauth-twitter (1.4.0) omniauth-twitter (1.4.0)
omniauth-oauth (~> 1.1) omniauth-oauth (~> 1.1)
rack rack
onebox (2.2.1) onebox (2.2.15)
addressable (~> 2.7.0) addressable (~> 2.7.0)
htmlentities (~> 4.3) htmlentities (~> 4.3)
multi_json (~> 1.11) multi_json (~> 1.11)
mustache mustache
nokogiri (~> 1.7) nokogiri (~> 1.7)
sanitize sanitize
openssl-signature_algorithm (1.0.0) openssl (2.2.0)
openssl-signature_algorithm (1.1.1)
openssl (~> 2.0)
optimist (3.0.1) optimist (3.0.1)
parallel (1.20.1) parallel (1.20.1)
parallel_tests (3.4.0) parallel_tests (3.7.0)
parallel parallel
parser (2.7.2.0) parser (3.0.1.1)
ast (~> 2.4.1) ast (~> 2.4.1)
pg (1.2.3) pg (1.2.3)
progress (3.5.2) progress (3.6.0)
pry (0.13.1) pry (0.13.1)
coderay (~> 1.1) coderay (~> 1.1)
method_source (~> 1.0) method_source (~> 1.0)
@ -260,11 +294,12 @@ GEM
pry-rails (0.3.9) pry-rails (0.3.9)
pry (>= 0.10.4) pry (>= 0.10.4)
public_suffix (4.0.6) public_suffix (4.0.6)
puma (5.0.4) puma (5.3.1)
nio4r (~> 2.0) nio4r (~> 2.0)
r2 (0.2.7) r2 (0.2.7)
racc (1.5.2)
rack (2.2.3) rack (2.2.3)
rack-mini-profiler (2.2.0) rack-mini-profiler (2.3.2)
rack (>= 1.2.0) rack (>= 1.2.0)
rack-protection (2.1.0) rack-protection (2.1.0)
rack rack
@ -275,23 +310,23 @@ GEM
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0) rails-html-sanitizer (1.3.0)
loofah (~> 2.3) loofah (~> 2.3)
rails_failover (0.6.2) rails_failover (0.7.3)
activerecord (~> 6.0) activerecord (~> 6.0)
concurrent-ruby concurrent-ruby
railties (~> 6.0) railties (~> 6.0)
rails_multisite (2.5.0) rails_multisite (3.0.0)
activerecord (> 5.0, < 7) activerecord (> 5.0, < 7)
railties (> 5.0, < 7) railties (> 5.0, < 7)
railties (6.0.3.3) railties (6.1.3.2)
actionpack (= 6.0.3.3) actionpack (= 6.1.3.2)
activesupport (= 6.0.3.3) activesupport (= 6.1.3.2)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0) thor (~> 1.0)
rainbow (3.0.0) rainbow (3.0.0)
raindrops (0.19.1) raindrops (0.19.1)
rake (13.0.1) rake (13.0.3)
rb-fsevent (0.10.4) rb-fsevent (0.11.0)
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
rbtrace (0.4.14) rbtrace (0.4.14)
@ -300,72 +335,72 @@ GEM
optimist (>= 3.0.0) optimist (>= 3.0.0)
rchardet (1.8.0) rchardet (1.8.0)
redis (4.2.5) redis (4.2.5)
redis-namespace (1.8.0) redis-namespace (1.8.1)
redis (>= 3.0.4) redis (>= 3.0.4)
regexp_parser (2.0.0) regexp_parser (2.1.1)
request_store (1.5.0) request_store (1.5.0)
rack (>= 1.4) rack (>= 1.4)
rexml (3.2.4) rexml (3.2.5)
rinku (2.0.6) rinku (2.0.6)
rotp (6.2.0) rotp (6.2.0)
rqrcode (1.1.2) rqrcode (2.0.0)
chunky_png (~> 1.0) chunky_png (~> 1.0)
rqrcode_core (~> 0.1) rqrcode_core (~> 1.0)
rqrcode_core (0.1.2) rqrcode_core (1.0.0)
rspec (3.10.0) rspec (3.10.0)
rspec-core (~> 3.10.0) rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0) rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.10.0) rspec-mocks (~> 3.10.0)
rspec-core (3.10.0) rspec-core (3.10.1)
rspec-support (~> 3.10.0) rspec-support (~> 3.10.0)
rspec-expectations (3.10.0) rspec-expectations (3.10.1)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0) rspec-support (~> 3.10.0)
rspec-html-matchers (0.9.4) rspec-html-matchers (0.9.4)
nokogiri (~> 1) nokogiri (~> 1)
rspec (>= 3.0.0.a, < 4) rspec (>= 3.0.0.a, < 4)
rspec-mocks (3.10.0) rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0) rspec-support (~> 3.10.0)
rspec-rails (4.0.1) rspec-rails (5.0.1)
actionpack (>= 4.2) actionpack (>= 5.2)
activesupport (>= 4.2) activesupport (>= 5.2)
railties (>= 4.2) railties (>= 5.2)
rspec-core (~> 3.9) rspec-core (~> 3.10)
rspec-expectations (~> 3.9) rspec-expectations (~> 3.10)
rspec-mocks (~> 3.9) rspec-mocks (~> 3.10)
rspec-support (~> 3.9) rspec-support (~> 3.10)
rspec-support (3.10.0) rspec-support (3.10.2)
rswag-specs (2.3.1) rswag-specs (2.4.0)
activesupport (>= 3.1, < 7.0) activesupport (>= 3.1, < 7.0)
json-schema (~> 2.2) json-schema (~> 2.2)
railties (>= 3.1, < 7.0) railties (>= 3.1, < 7.0)
rtlit (0.0.5) rtlit (0.0.5)
rubocop (1.4.2) rubocop (1.14.0)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.7.1.5) parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8) regexp_parser (>= 1.8, < 3.0)
rexml rexml
rubocop-ast (>= 1.1.1) rubocop-ast (>= 1.5.0, < 2.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0) unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.2.0) rubocop-ast (1.5.0)
parser (>= 2.7.1.5) parser (>= 3.0.1.1)
rubocop-discourse (2.4.1) rubocop-discourse (2.4.1)
rubocop (>= 1.1.0) rubocop (>= 1.1.0)
rubocop-rspec (>= 2.0.0) rubocop-rspec (>= 2.0.0)
rubocop-rspec (2.0.0) rubocop-rspec (2.3.0)
rubocop (~> 1.0) rubocop (~> 1.0)
rubocop-ast (>= 1.1.0) rubocop-ast (>= 1.1.0)
ruby-prof (1.4.2) ruby-prof (1.4.3)
ruby-progressbar (1.10.1) ruby-progressbar (1.11.0)
ruby-readability (0.7.0) ruby-readability (0.7.0)
guess_html_encoding (>= 0.0.4) guess_html_encoding (>= 0.0.4)
nokogiri (>= 1.6.0) nokogiri (>= 1.6.0)
ruby2_keywords (0.0.2) ruby2_keywords (0.0.4)
rubyzip (2.3.0) rubyzip (2.3.0)
sanitize (5.2.1) sanitize (5.2.3)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.8.0) nokogiri (>= 1.8.0)
nokogumbo (~> 2.0) nokogumbo (~> 2.0)
@ -381,18 +416,18 @@ GEM
seed-fu (2.3.9) seed-fu (2.3.9)
activerecord (>= 3.1) activerecord (>= 3.1)
activesupport (>= 3.1) activesupport (>= 3.1)
shoulda-matchers (4.4.1) shoulda-matchers (4.5.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
sidekiq (6.1.2) sidekiq (6.2.1)
connection_pool (>= 2.2.2) connection_pool (>= 2.2.2)
rack (~> 2.0) rack (~> 2.0)
redis (>= 4.2.0) redis (>= 4.2.0)
simplecov (0.20.0) simplecov (0.21.2)
docile (~> 1.1) docile (~> 1.1)
simplecov-html (~> 0.11) simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1) simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3) simplecov-html (0.12.3)
simplecov_json_formatter (0.1.2) simplecov_json_formatter (0.1.3)
sprockets (3.7.2) sprockets (3.7.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
@ -401,24 +436,24 @@ GEM
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sshkey (2.0.0) sshkey (2.0.0)
stackprof (0.2.16) stackprof (0.2.17)
test-prof (0.12.2) test-prof (1.0.5)
thor (1.0.1) thor (1.1.0)
thread_safe (0.3.6)
tilt (2.0.10) tilt (2.0.10)
tzinfo (1.2.8) tzinfo (2.0.4)
thread_safe (~> 0.1) concurrent-ruby (~> 1.0)
uglifier (4.2.0) uglifier (4.2.0)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.7.7) unf_ext (0.0.7.7)
unicode-display_width (1.7.0) unicode-display_width (2.0.0)
unicorn (5.7.0) unicorn (6.0.0)
kgio (~> 2.6) kgio (~> 2.6)
raindrops (~> 0.7) raindrops (~> 0.7)
uniform_notifier (1.13.0) uniform_notifier (1.14.2)
webmock (3.10.0) uri_template (0.7.0)
webmock (3.12.2)
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0) hashdiff (>= 0.4.0, < 2.0.0)
@ -427,20 +462,25 @@ GEM
jwt (~> 2.0) jwt (~> 2.0)
xorcist (1.1.2) xorcist (1.1.2)
yaml-lint (0.0.10) yaml-lint (0.0.10)
zeitwerk (2.4.1) zeitwerk (2.4.2)
PLATFORMS PLATFORMS
arm64-darwin-20
ruby ruby
x86_64-darwin-18
x86_64-darwin-19
x86_64-darwin-20
x86_64-linux
DEPENDENCIES DEPENDENCIES
actionmailer (= 6.0.3.3) actionmailer (= 6.1.3.2)
actionpack (= 6.0.3.3) actionpack (= 6.1.3.2)
actionview (= 6.0.3.3) actionview (= 6.1.3.2)
actionview_precompiler actionview_precompiler
active_model_serializers (~> 0.8.3) active_model_serializers (~> 0.8.3)
activemodel (= 6.0.3.3) activemodel (= 6.1.3.2)
activerecord (= 6.0.3.3) activerecord (= 6.1.3.2)
activesupport (= 6.0.3.3) activesupport (= 6.1.3.2)
addressable addressable
annotate annotate
aws-sdk-s3 aws-sdk-s3
@ -461,6 +501,7 @@ DEPENDENCIES
discourse-ember-rails (= 0.18.6) discourse-ember-rails (= 0.18.6)
discourse-ember-source (~> 3.12.2) discourse-ember-source (~> 3.12.2)
discourse-fonts discourse-fonts
discourse_dev
discourse_image_optim discourse_image_optim
email_reply_trimmer email_reply_trimmer
ember-handlebars-template (= 0.8.0) ember-handlebars-template (= 0.8.0)
@ -471,20 +512,21 @@ DEPENDENCIES
fast_blank fast_blank
fast_xs fast_xs
fastimage fastimage
flamegraph
gc_tracer gc_tracer
highline highline
htmlentities htmlentities
http_accept_language http_accept_language
json json
json_schemer
listen listen
lograge lograge
logstash-event logstash-event
logstash-logger logstash-logger
logster logster
loofah
lru_redux lru_redux
lz4-ruby lz4-ruby
mail mail!
maxminddb maxminddb
memory_profiler memory_profiler
message_bus message_bus
@ -518,7 +560,7 @@ DEPENDENCIES
rack-protection rack-protection
rails_failover rails_failover
rails_multisite rails_multisite
railties (= 6.0.3.3) railties (= 6.1.3.2)
rake rake
rb-fsevent rb-fsevent
rbtrace rbtrace
@ -558,4 +600,4 @@ DEPENDENCIES
yaml-lint yaml-lint
BUNDLED WITH BUNDLED WITH
2.1.4 2.2.16

579
pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
View file

File diff suppressed because it is too large Load diff

4
pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch
View file

@ -1,10 +1,10 @@
diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index 373e235b3f..57d4d7a55b 100644 index ffcafcb618..31ba691983 100644
--- a/config/unicorn.conf.rb --- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb +++ b/config/unicorn.conf.rb
@@ -27,18 +27,10 @@ pid (ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid") @@ -27,18 +27,10 @@ pid (ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid")
if ENV["RAILS_ENV"] == "development" || !ENV["RAILS_ENV"] if ENV["RAILS_ENV"] != "production"
logger Logger.new($stdout) logger Logger.new($stdout)
- # we want a longer timeout in dev cause first request can be really slow - # we want a longer timeout in dev cause first request can be really slow
- timeout (ENV["UNICORN_TIMEOUT"] && ENV["UNICORN_TIMEOUT"].to_i || 60) - timeout (ENV["UNICORN_TIMEOUT"] && ENV["UNICORN_TIMEOUT"].to_i || 60)