Unverified Commit e4b10f18 authored by Robin Gloster's avatar Robin Gloster Committed by GitHub
Browse files

Merge pull request #257294 from MTRNord/MTRNord/update-discourse 

Update Discourse and Discourse plugins
parents c8999ca6 80bd5341

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

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb

index 3fee4259af9..53cc3107f46 100644

--- a/lib/discourse_js_processor.rb

+++ b/lib/discourse_js_processor.rb

@@ -111,8 +111,6 @@ class DiscourseJsProcessor

 

     def self.generate_js_processor

       Discourse::Utils.execute_command(

-        "yarn",

-        "--silent",

         "esbuild",

         "--log-level=warning",

         "--bundle",

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

+18 −3
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
, gzip

, gnutar

, git

, esbuild

, cacert

, util-linux

, gawk
@@ -46,13 +47,13 @@ 
}@args:



let

  version = "3.1.0";

  version = "3.2.0.beta1";



  src = fetchFromGitHub {

    owner = "discourse";

    repo = "discourse";

    rev = "v${version}";

    sha256 = "sha256-Iv7VSnK8nZDpmIwIRPedSWlftABKuMOQ4MXDGpjuWrY=";

    sha256 = "sha256-HVjt5rsLSuyOaQxkbiTrsYsSXj3oSWjke98QVp+tEqk=";

  };



  ruby = ruby_3_2;
@@ -65,6 +66,7 @@ let 
    gnutar

    git

    brotli

    esbuild



    # Misc required system utils

    which
@@ -202,7 +204,7 @@ let 


    yarnOfflineCache = fetchYarnDeps {

      yarnLock = src + "/app/assets/javascripts/yarn.lock";

      sha256 = "0sclrv3303dgg3r08dwhd1yvi3pvlnvnikn300vjsh6c71fnzhnj";

      sha256 = "070h66zp8kmsigbrkh5d3jzbzvllzhbx0fa2yzx5lbpgnjhih3p2";

    };



    nativeBuildInputs = runtimeDeps ++ [
@@ -215,6 +217,7 @@ let 
      nodejs_18

      jq

      moreutils

      esbuild

    ];



    outputs = [ "out" "javascripts" ];
@@ -238,6 +241,12 @@ let 
      # hasn't been `patchShebangs`-ed yet. So instead we just use

      # `patch-package` from `nativeBuildInputs`.

      ./asserts_patch-package_from_path.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

    ];



    # We have to set up an environment that is close enough to
@@ -351,6 +360,12 @@ 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-assign/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ mkDiscoursePlugin { 
  src = fetchFromGitHub {

    owner = "discourse";

    repo = "discourse-assign";

    rev = "0cbf10b8055370445bd36536e51986bf48bdc57e";

    sha256 = "sha256-7rJ2zQo1nCHwtVuLJUmdj66Ky2bi4Cpo+22H3DbO1uo=";

    rev = "e9c7cb5c3f90109bc47223b0aa4054d681e9cc04";

    sha256 = "sha256-w1h1dCSyOml+AT7lPKENYfawm6BU2De5CyBHrDnDcrM=";

  };

  meta = with lib; {

    homepage = "https://github.com/discourse/discourse-docs";

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

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ mkDiscoursePlugin { 
  src = fetchFromGitHub {

    owner = "discourse";

    repo = "discourse-bbcode-color";

    rev = "35aab2e9b92f8b01633d374ea999e7fd59d020d7";

    sha256 = "sha256-DHckx921EeQysm1UPloCrt43BJetTnZKnTbJGk15NMs=";

    rev = "79ed22b3a3352adbd20f7e2222b9dbdb9fbaf7fe";

    sha256 = "sha256-AHgny9BW/ssmv0U2lwzVWgYKPsvWHD6kgU3mBMFX4Aw=";

  };

  meta = with lib; {

    homepage = "https://github.com/discourse/discourse-bbcode-color";

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

+1 −1
Original line number Diff line number Diff line
@@ -22,4 +22,4 @@ DEPENDENCIES 
  rrule (= 0.4.4)



BUNDLED WITH

   2.4.13
 
   2.4.17