Unverified Commit 42e786fc authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #315171 from NixOS/backport-315162-to-release-24.05 

[Backport release-24.05] discourse: update plugins
parents 60266426 55ee8011

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

+3 −0
Original line number Diff line number Diff line
@@ -409,6 +409,9 @@ let 


    passthru = {

      inherit rubyEnv runtimeEnv runtimeDeps rake mkDiscoursePlugin assets;

      inherit (pkgs)

        discourseAllPlugins

      ;

      enabledPlugins = plugins;

      plugins = callPackage ./plugins/all-plugins.nix { inherit mkDiscoursePlugin; };

      ruby = rubyEnv.wrappedRuby;

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 = "b796ae3fcc89b48cf777de5ee3a4c21aada9271e";

    sha256 = "sha256-PnSD2ZuUVjH8TifHuzbkpmpfGSN/q4VWyJtkOPND44o=";

  };

  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 = "3336efe231e6c02e1dbe11ada71296af258cff58";

    sha256 = "sha256-C2PPF8kJm0agcYcRSUUBmmxZJliPatPM1vRtjufEd4M=";

  };

  meta = with lib; {

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

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

+15 −5
Original line number Diff line number Diff line 
GEM

  remote: https://rubygems.org/

  specs:

    activesupport (7.0.8)

    activesupport (7.1.3.3)

      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)

    concurrent-ruby (1.2.2)

    i18n (1.14.1)

    base64 (0.2.0)

    bigdecimal (3.1.8)

    concurrent-ruby (1.2.3)

    connection_pool (2.4.1)

    drb (2.2.1)

    i18n (1.14.5)

      concurrent-ruby (~> 1.0)

    minitest (5.20.0)

    minitest (5.23.1)

    mutex_m (0.2.0)

    rrule (0.4.4)

      activesupport (>= 2.3)

    tzinfo (2.0.6)
@@ -22,4 +32,4 @@ DEPENDENCIES 
  rrule (= 0.4.4)



BUNDLED WITH

   2.4.13
 
   2.5.9

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

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

    owner = "discourse";

    repo = "discourse-calendar";

    rev = "afc2ee684de41601d6cecc46713d139760f176a6";

    sha256 = "sha256-rTQWO+E/Jg4zjZDYDvBrDQsox5q4dHkdQjwnJxgv3dI=";

    rev = "455eeed541a9b5cacf627349e543028427178a44";

    sha256 = "sha256-RXjMpeqCvAvwNsHpc3Fyms4pRXXqvarU8hWo3o1VgXY=";

  };

  meta = with lib; {

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