Unverified Commit d3ccbe1e authored by Kira Bruneau's avatar Kira Bruneau Committed by GitHub
Browse files

Merge pull request #228716 from IndeedNotJames/discourse

discourse: 3.1.0.beta2 -> 3.1.0.beta4, discourseAllPlugins: update all
parents 1cae4706 06fa6807
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -651,6 +651,9 @@ in
      preload_link_header = false;
      redirect_avatar_requests = false;
      pg_force_readonly_mode = false;
      dns_query_timeout_secs = null;
      regex_timeout_seconds = 2;
      allow_impersonation = true;
    };

    services.redis.servers.discourse =
+13 −0
Original line number Diff line number Diff line
diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index 9e4533d2..e57f8a5f 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -14,7 +14,7 @@
     "build": "ember build",
     "start": "ember serve",
     "test": "ember test",
-    "postinstall": "yarn --silent --cwd .. patch-package"
+    "postinstall": "patch-package"
   },
   "dependencies": {
     "@babel/core": "^7.21.4",
+27 −5
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@
, bundlerEnv
, callPackage

, ruby_3_1
, ruby_3_2
, replace
, gzip
, gnutar
@@ -38,21 +38,22 @@
, fixup_yarn_lock
, nodePackages
, nodejs_16
, dart-sass-embedded

, plugins ? []
}@args:

let
  version = "3.1.0.beta2";
  version = "3.1.0.beta4";

  src = fetchFromGitHub {
    owner = "discourse";
    repo = "discourse";
    rev = "v${version}";
    sha256 = "sha256-wkNTm5/QyujPcMUrnc6eWmjhrRQAthhmejmjpy6zmbE=";
    sha256 = "sha256-22GXFYPjPYL20amR4xFB4L/dCp32H4Z3uf0GLGEghUE=";
  };

  ruby = ruby_3_1;
  ruby = ruby_3_2;

  runtimeDeps = [
    # For backups, themes and assets
@@ -186,6 +187,20 @@ let
              cp $(readlink -f ${libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so
            '';
          };
          sass-embedded = gems.sass-embedded // {
            dontBuild = false;
            # `sass-embedded` depends on `dart-sass-embedded` and tries to
            # fetch that as `.tar.gz` from GitHub releases. That `.tar.gz`
            # can also be specified via `SASS_EMBEDDED`. But instead of
            # compressing our `dart-sass-embedded` just to decompress it
            # again, we simply patch the Rakefile to symlink that path.
            patches = [
              ./rubyEnv/sass-embedded-static.patch
            ];
            postPatch = ''
              export SASS_EMBEDDED=${dart-sass-embedded}
            '';
          };
        };

    groups = [
@@ -199,7 +214,7 @@ let

    yarnOfflineCache = fetchYarnDeps {
      yarnLock = src + "/app/assets/javascripts/yarn.lock";
      sha256 = "0ryc4p5s35mzg1p71z98x5fvr5fpldmgghdi1viha4ckbpv153lw";
      sha256 = "0a20kns4irdpzzx2dvdjbi0m3s754gp737q08z5nlcnffxqvykrk";
    };

    nativeBuildInputs = runtimeDeps ++ [
@@ -207,6 +222,7 @@ let
      redis
      nodePackages.uglify-js
      nodePackages.terser
      nodePackages.patch-package
      yarn
      nodejs_16
    ];
@@ -226,6 +242,12 @@ let
      # Fix the rake command used to recursively execute itself in the
      # assets precompilation task.
      ./assets_rake_command.patch

      # `app/assets/javascripts/discourse/package.json`'s postinstall
      # hook tries to call `../node_modules/.bin/patch-package`, which
      # hasn't been `patchShebangs`-ed yet. So instead we just use
      # `patch-package` from `nativeBuildInputs`.
      ./asserts_patch-package_from_path.patch
    ];

    # We have to set up an environment that is close enough to
+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
  src = fetchFromGitHub {
    owner = "discourse";
    repo = "discourse-assign";
    rev = "c6e6a883f66670e5cfc1eb973af8ac5b7c20f815";
    sha256 = "sha256-OwNV+ZNogUgd6ZKdXwUqoMqcZKc4jbf276rHIYQzjYc=";
    rev = "a655a009fade4671e4a2d38f0a0f7ce89d201d80";
    sha256 = "sha256-HCwId3/7NRuToLFyJrOVaAiSxysB7XNZp9BUndSJzlY=";
  };
  meta = with lib; {
    homepage = "https://github.com/discourse/discourse-docs";
+5 −5
Original line number Diff line number Diff line
GEM
  remote: https://rubygems.org/
  specs:
    activesupport (7.0.4.2)
    activesupport (7.0.4.3)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
      tzinfo (~> 2.0)
    concurrent-ruby (1.2.0)
    i18n (1.12.0)
    concurrent-ruby (1.2.2)
    i18n (1.13.0)
      concurrent-ruby (~> 1.0)
    minitest (5.17.0)
    minitest (5.18.0)
    rrule (0.4.4)
      activesupport (>= 2.3)
    tzinfo (2.0.6)
@@ -22,4 +22,4 @@ DEPENDENCIES
  rrule (= 0.4.4)

BUNDLED WITH
   2.4.6
   2.4.10
Loading