discourse: 3.2.0.beta1 -> 3.2.0.beta3

nixos/modules/services/web-apps/discourse.nix

@@ -654,6 +654,7 @@ in
       dns_query_timeout_secs = null;
       regex_timeout_seconds = 2;
       allow_impersonation = true;
+      log_line_max_chars = 160000;
     };
 
     services.redis.servers.discourse =

pkgs/development/tools/esbuild/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "esbuild";
-  version = "0.18.0";
+  version = "0.19.2";
 
   src = fetchFromGitHub {
     owner = "evanw";
     repo = "esbuild";
     rev = "v${version}";
-    hash = "sha256-3tZbYLYuT1F/OumxlpcXmGTyBPCeK21Le35zxLGbQuw=";
+    hash = "sha256-U/CAuLl+I3wNPXYcXr9r6DdT9fywvOTt25Vyu3OKG84=";
   };
 
   vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

pkgs/servers/web-apps/discourse/asserts_patch-package_from_path.patch

@@ -6,7 +6,7 @@ index 9e4533d2..e57f8a5f 100644
      "build": "ember build",
      "start": "ember serve",
      "test": "ember test",
--    "postinstall": "yarn --silent --cwd .. patch-package"
+-    "postinstall": "../run-patch-package"
 +    "postinstall": "patch-package"
    },
    "dependencies": {

pkgs/servers/web-apps/discourse/assets_rake_command.patch

@@ -2,12 +2,12 @@ diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
 index 68b5db61ac..d460b5753e 100644
 --- a/lib/tasks/assets.rake
 +++ b/lib/tasks/assets.rake
-@@ -19,7 +19,7 @@ task 'assets:precompile:before' do
-
-     if only_assets_precompile_remaining
-       # Using exec to free up Rails app memory during ember build
--      exec "#{compile_command} && EMBER_CLI_COMPILE_DONE=1 bin/rake assets:precompile"
-+      exec "#{compile_command} && EMBER_CLI_COMPILE_DONE=1 bundle exec rake assets:precompile"
+@@ -31,7 +31,7 @@ task 'assets:precompile:build' do
+     if only_ember_precompile_build_remaining
+       exec "#{compile_command}"
+     elsif only_assets_precompile_remaining
+-      exec "#{compile_command} && SKIP_EMBER_CLI_COMPILE=1 bin/rake assets:precompile"
++      exec "#{compile_command} && SKIP_EMBER_CLI_COMPILE=1 bundle exec rake assets:precompile"
      else
-       system compile_command
-     end
+       system compile_command, exception: true
+       EmberCli.clear_cache!

pkgs/servers/web-apps/discourse/auto_generated_path.patch

@@ -2,7 +2,7 @@ diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
 index 8482ff0210..826d111d65 100644
 --- a/lib/plugin/instance.rb
 +++ b/lib/plugin/instance.rb
-@@ -455,7 +455,7 @@ class Plugin::Instance
+@@ -496,7 +496,7 @@ class Plugin::Instance
    end
 
    def auto_generated_path

pkgs/servers/web-apps/discourse/default.nix

@@ -35,6 +35,7 @@
 , rsync
 , icu
 , fetchYarnDeps
+, mkYarnModules
 , yarn
 , fixup_yarn_lock
 , nodePackages
@@ -47,13 +48,13 @@
 }@args:
 
 let
-  version = "3.2.0.beta1";
+  version = "3.2.0.beta3";
 
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse";
     rev = "v${version}";
-    sha256 = "sha256-HVjt5rsLSuyOaQxkbiTrsYsSXj3oSWjke98QVp+tEqk=";
+    sha256 = "sha256-gW5U1DSYTqViiyVHfVpc/IAicccuRCf3xow9xpIY5sA=";
   };
 
   ruby = ruby_3_2;
@@ -206,13 +207,20 @@ let
     ];
   };
 
-  assets = stdenv.mkDerivation {
+  assets = let
+    yarnBuildDeps = mkYarnModules {
+      pname = "discourse-assets-yarn-build-deps";
+      inherit version;
+      packageJSON = src + "/package.json";
+      yarnLock = src + "/yarn.lock";
+    };
+  in stdenv.mkDerivation {
     pname = "discourse-assets";
     inherit version src;
 
     yarnOfflineCache = fetchYarnDeps {
       yarnLock = src + "/app/assets/javascripts/yarn.lock";
-      sha256 = "070h66zp8kmsigbrkh5d3jzbzvllzhbx0fa2yzx5lbpgnjhih3p2";
+      sha256 = "0ls0nc25np3pk2qc73ic81i195pqa3wb09z0l2i6ysp7f21q01wk";
     };
 
     nativeBuildInputs = runtimeDeps ++ [
@@ -254,14 +262,18 @@ let
       # tries to call `../node_modules/.bin/esbuild`, which
       # hasn't been `patchShebangs`-ed yet. So instead we just use
       # `esbuild` from `nativeBuildInputs`.
-      ./assets_esbuild_from_path.patch
+      #./assets_esbuild_from_path.patch
     ];
 
+    ESBUILD_BINARY_PATH = "${esbuild}/bin/esbuild";
+
     # We have to set up an environment that is close enough to
     # production ready or the assets:precompile task refuses to
     # run. This means that Redis and PostgreSQL has to be running and
     # database migrations performed.
     preBuild = ''
+      ln -sf ${yarnBuildDeps}/node_modules node_modules
+
       # Yarn wants a real home directory to write cache, config, etc to
       export HOME=$NIX_BUILD_TOP/fake_home
 
@@ -368,12 +380,6 @@ let
 
       # Make sure the notification email setting applies
       ./notification_email.patch
-
-      # `lib/discourse_js_processor.rb`
-      # tries to call `../node_modules/.bin/esbuild`, which
-      # hasn't been `patchShebangs`-ed yet. So instead we just use
-      # `esbuild` from `nativeBuildInputs`.
-      ./assets_esbuild_from_path.patch
     ];
 
     postPatch = ''

pkgs/servers/web-apps/discourse/plugins/discourse-adplugin/default.nix

@@ -5,8 +5,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-adplugin";
-    rev = "30c49eb50d6d16fcf82bace3da0e1972b7b220c0";
-    sha256 = "sha256-rCzyRxBJnsBTDY+QlaNg9lwlcD9sis/RJrSBKHnPWYU=";
+    rev = "1d39cd8c802853923182126c68284ea86205635e";
+    sha256 = "sha256-bNVGGjTNDdC1+0s842lof6mcOcncfNF1m8v0VR7ov2g=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-adplugin";

pkgs/servers/web-apps/discourse/plugins/discourse-akismet/default.nix

@@ -5,8 +5,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-akismet";
-    rev = "d1ef7a9ab2b92237905106df8cd3e596a42cf6a6";
-    sha256 = "sha256-InNn+wDi9G0rLbur4yzezla+AgCEpo/9ACcUtSOF4yE=";
+    rev = "042cf206d7213e15aa1324081e607f1e6a1ec597";
+    sha256 = "sha256-x6dK2W9HjzMeSwSdjAYokj7otsd54QhFA2HNoc6+fEI=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-akismet";

pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix

@@ -5,8 +5,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-assign";
-    rev = "e9c7cb5c3f90109bc47223b0aa4054d681e9cc04";
-    sha256 = "sha256-w1h1dCSyOml+AT7lPKENYfawm6BU2De5CyBHrDnDcrM=";
+    rev = "df34e91b55d0d068bd983fd6a9fd7d3235cfc1fe";
+    sha256 = "sha256-MZB/UGhSa6I32hu4GBv43iMh398J1q/fZaXl+YiL6fE=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-docs";

pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix

@@ -5,8 +5,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-bbcode-color";
-    rev = "79ed22b3a3352adbd20f7e2222b9dbdb9fbaf7fe";
-    sha256 = "sha256-AHgny9BW/ssmv0U2lwzVWgYKPsvWHD6kgU3mBMFX4Aw=";
+    rev = "57d094ecfa2c2d92a18821471e463490d975097f";
+    sha256 = "sha256-7dHGCkCnvlcg+s91NpymJms6ZCufqFblDNu4F2XUHkQ=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-bbcode-color";

pkgs/servers/web-apps/discourse/plugins/discourse-cakeday/default.nix

@@ -5,8 +5,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-cakeday";
-    rev = "1fc3b4c1f67adf83d034000043d86feb933c90cd";
-    sha256 = "sha256-NpTF6MR7ZR8cMpJGX0ma3L/K8MuAvjxIqd1x7dHaY3Q=";
+    rev = "6a721f5e93dc61292c538b25c8e09c3f39977d7f";
+    sha256 = "sha256-s9LMltYBxLhe57Uh3BQxS2IffQiby7pi6EaWRpFGFFc=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-cakeday";

pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock

@@ -1,17 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.7)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.4)
     concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    drb (2.2.0)
+      ruby2_keywords
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.19.0)
+    minitest (5.20.0)
+    mutex_m (0.2.0)
     rrule (0.4.4)
       activesupport (>= 2.3)
+    ruby2_keywords (0.0.5)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
 
@@ -22,4 +34,4 @@ DEPENDENCIES
   rrule (= 0.4.4)
 
 BUNDLED WITH
-   2.4.17
+   2.4.13

pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix

@@ -6,8 +6,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-calendar";
-    rev = "4d4fe40d09f7232b1348e1ff910b37b2cec0835d";
-    sha256 = "sha256-w1sqE3KxwrE8SWqZUtPVhjITOPFXwlj4iPyPZeSfvtI=";
+    rev = "0d5a12cb401eacb4a523d39c38f781d06c307421";
+    sha256 = "sha256-uIi2PJiUYWvjzrkXM5E5gFvnAamEZRS14UoakoSNr5Q=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-calendar";

pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix

@@ -1,14 +1,34 @@
 {
   activesupport = {
-    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+    dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wzbnv3hns0yiwbgh1m3q5j0d7b0k52nlpwirhxyv3l0ycmljfr9";
+      sha256 = "1l6hmf99zgckpn812qfxfz60rbh0zixv1hxnxhjlg8942pvixn2v";
       type = "gem";
     };
-    version = "7.0.7";
+    version = "7.1.2";
+  };
+  base64 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  bigdecimal = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07y615s8yldk3k13lmkhpk1k190lcqvmxmnjwgh4bzjan9xrc36y";
+      type = "gem";
+    };
+    version = "3.1.4";
   };
   concurrent-ruby = {
     groups = ["default"];
@@ -20,6 +40,27 @@
     };
     version = "1.2.2";
   };
+  connection_pool = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g";
+      type = "gem";
+    };
+    version = "2.4.1";
+  };
+  drb = {
+    dependencies = ["ruby2_keywords"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
   i18n = {
     dependencies = ["concurrent-ruby"];
     groups = ["default"];
@@ -36,10 +77,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6";
+      sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3";
       type = "gem";
     };
-    version = "5.19.0";
+    version = "5.20.0";
+  };
+  mutex_m = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
+      type = "gem";
+    };
+    version = "0.2.0";
   };
   rrule = {
     dependencies = ["activesupport"];
@@ -52,6 +103,16 @@
     };
     version = "0.4.4";
   };
+  ruby2_keywords = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
+      type = "gem";
+    };
+    version = "0.0.5";
+  };
   tzinfo = {
     dependencies = ["concurrent-ruby"];
     groups = ["default"];

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 = "4f9ccb58cae8600dcb6db84f38f235283911e6e8";
-    sha256 = "sha256-Em9aAwAfUoqsOHLrqNhxUQXsO4Owydf9nhCHbBaqqpg=";
+    rev = "a6dfc289a4b946cf4032e934cfc27be9eabae1a1";
+    sha256 = "sha256-UBr6CAOIdgY+RAUMiJIOXL/6ljUEilzods31G7Bijwg=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-chat-integration";

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 = "06193f27ef15828479eea61ae4a80bf59806a535";
-    sha256 = "sha256-afjqgi2gzRpbZt5K9yXPy4BJ5qRv7A4ZkXHX85+Cv7s=";
+    rev = "fbe2a37e0cc1bed3e3f58e5e36727a96b88d8340";
+    sha256 = "sha256-UibnDYXfa5MN2t8YSqGtK+Szj4xDF1RckS7izfd1ZEQ=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-data-explorer";

pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix

@@ -5,8 +5,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-docs";
-    rev = "89c7274b1a730edefd1b56c13b8c04305d4ef331";
-    sha256 = "sha256-j3zrGmoAvbSHFnbiUfetyfiQJebrtW3Iw5GvsRRq1kk=";
+    rev = "76a76dbf0d8effb078b7a1b135400fe283b68e51";
+    sha256 = "sha256-YGUgy2ZFUPwDCJAEqix22kbkUQn5UIS/eCiEPZBghrc=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-docs";