mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-28 19:24:45 +00:00
b94714baca
Update discourse to latest(ish) ESR version from previous, soon-to-be unsupported, ESR version. Upstream changes: https://releases.discourse.org/changelog/custom?end=v2026.7.0&start=v2026.1.4 Changes: - simple version / dep updates of all plugins and discourse itself - updated the update script to correctly handle changes to discourses's architecture, and fixed a bug - the NamedTemporaryFiles were not flush()ed, which meant their content was not written - discourse now has dependencies under `migrations/` which are specified by path. this requires downloading the `migrations/` directory during the update so `bundle lock` / `bundix` run successfully. the logic for performing this was borrowed from the gitlab package. - the hashes for the newly added dart-sass download are automatically updated - updated some patches to match changes in the targeted code (notification_email, prebuild-asset-processor) - delete a no longer relevant patch (unicorn_logging_and_timeout) (discourse no longer uses unicorn internally, although the external interface is similar / pretends to still exist) - added two new patches, safe-exec-from-nix-store and sass_embedded_vendored_dart_sass - safe-exec-from-nix-store: add /nix/store to the list of executable paths for the container used to sandbox imagemagick, which by default only contains the standard FHS paths - sass_embedded_vendored_dart_sass: patch sass-embedded to use a version of dart-sass provided by the package instead of downloading it's own which would fail. this patch also involves code in default.nix which sets DART_SASS_VENDORED to the path of a downloaded dart-sass version - updated the comment on prebuild-asset-processor.patch to more accurately reflect what and why it exists
14 lines
400 B
Diff
14 lines
400 B
Diff
diff --git a/lib/asset_processor.rb b/lib/asset_processor.rb
|
|
index bacb376c856..11d7d7edd32 100644
|
|
--- a/lib/asset_processor.rb
|
|
+++ b/lib/asset_processor.rb
|
|
@@ -3,7 +3,7 @@
|
|
class AssetProcessor
|
|
BASE_COMPILER_VERSION = 113
|
|
|
|
- PROCESSOR_DIR = "tmp/asset-processor"
|
|
+ PROCESSOR_DIR = "frontend/asset-processor.build"
|
|
LOCK_FILE = "#{PROCESSOR_DIR}/build.lock"
|
|
|
|
CACHE_DEPENDENCY_GLOBS = %w[
|