Unverified Commit aefbed05 authored by Ryan Mulligan's avatar Ryan Mulligan Committed by GitHub
Browse files

Merge pull request #151650 from ryantm/discourse2.8.0beta10 

discourse: 2.8.0.beta9 -> 2.8.0.beta10; update plugins
parents 410c054a ae77e2fb

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

+7 −3
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 
}@args:



let

  version = "2.8.0.beta9";

  version = "2.8.0.beta10";



  src = fetchFromGitHub {

    owner = "discourse";

    repo = "discourse";

    rev = "v${version}";

    sha256 = "sha256-cTedMbf0N50ysRQqA9Fm1WQmI5J5hsqDSi2JZIa49jg=";

    sha256 = "sha256-mlTOsHR8p0mTdhZHBESyDAa1XtMJ4uIht0VUcGD6Ses=";

  };



  runtimeDeps = [
@@ -313,7 +313,11 @@ let 
      enabledPlugins = plugins;

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

      ruby = rubyEnv.wrappedRuby;

      tests = import ../../../../nixos/tests/discourse.nix { package = pkgs.discourse.override args; };

      tests = import ../../../../nixos/tests/discourse.nix {

        inherit (stdenv) system;

        inherit pkgs;

        package = pkgs.discourse.override args;

      };

    };

  };

in discourse

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 = "91d0712b0440b6bb0c2fedbf6c31191cdeb991fe";

    sha256 = "sha256-ATWLu0vJZFquRcAUpFKaU8mqjjVOv3PziAsHR3aemWk=";

    rev = "920503f5fc2cbec1b3ba4d431cffda2281e12509";

    sha256 = "sha256-qMUlJwETu99Qmbh4sn/1Vn7Xgaj3Jhi+/E8ecIbnVH8=";

  };

  meta = with lib; {

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

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

+2 −4
Original line number Diff line number Diff line 
GEM

  remote: https://rubygems.org/

  specs:

    activesupport (6.1.4.1)

    activesupport (7.0.0)

      concurrent-ruby (~> 1.0, >= 1.0.2)

      i18n (>= 1.6, < 2)

      minitest (>= 5.1)

      tzinfo (~> 2.0)

      zeitwerk (~> 2.3)

    concurrent-ruby (1.1.9)

    i18n (1.8.11)

      concurrent-ruby (~> 1.0)

    minitest (5.14.4)

    minitest (5.15.0)

    rrule (0.4.2)

      activesupport (>= 4.1)

    tzinfo (2.0.4)

      concurrent-ruby (~> 1.0)

    zeitwerk (2.5.1)



PLATFORMS

  ruby

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

    sha256 = "sha256-qBtq8IvxdKYIFNL9DwdRqZceMMO/qgd6jTr3kk3so3Y=";

    rev = "9c5516ff039225be04b1302c5c67837ce64fba9c";

    sha256 = "sha256-tfQWhkQvHrIUl0+tIv8X65MvoUhUnKD7KHwQbBm3p7U=";

  };

  meta = with lib; {

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

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

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

  activesupport = {

    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];

    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4";

      sha256 = "04bsr3420wb8y5pagg3s0rkx44fix47wrjvfby2d205l9bq6azyk";

      type = "gem";

    };

    version = "6.1.4.1";

    version = "7.0.0";

  };

  concurrent-ruby = {

    groups = ["default"];
@@ -36,10 +36,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";

      sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd";

      type = "gem";

    };

    version = "5.14.4";

    version = "5.15.0";

  };

  rrule = {

    dependencies = ["activesupport"];
@@ -63,14 +63,4 @@ 
    };

    version = "2.0.4";

  };

  zeitwerk = {

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj";

      type = "gem";

    };

    version = "2.5.1";

  };

}