Commit Graph

37 Commits

Author SHA1 Message Date
github-actions[bot]
c58a108aaa
Merge master into staging-next 2022-04-16 06:01:08 +00:00
Ryan Mulligan
8c33504431 discourse: 2.9.0.beta3 -> 2.9.0.beta4 2022-04-14 13:23:50 -07:00
Vladimír Čunát
d5d94127fd
Merge branch 'staging-next' into staging
Minor conflicts; I hope I didn't mess up:
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/games/openjk/default.nix
2022-04-14 09:53:21 +02:00
talyz
04afc69a29
discourse: 2.9.0.beta1 -> 2.9.0.beta3 2022-03-25 12:05:48 +01:00
Naïm Favier
9160044f5f
treewide/makeWrapper: replace --run cd with --chdir
Lay the groundwork for switching to binary wrappers by reducing uses
of `--run` (which is not supported by `makeBinaryWrapper`).
2022-03-19 09:46:31 +01:00
Ryan Mulligan
c0ddbde02f discourse: 2.8.0.beta11 -> 2.9.0.beta1 2022-01-27 16:42:23 -08:00
Ryan Mulligan
3d2cb0d6a2 discourse: 2.8.0.beta10 -> 2.8.0.beta11
https://meta.discourse.org/t/2-8-0-beta11-user-will-not-be-mentioned-warning-updated-emoji-and-more/214752

Small fix to a patch but otherwise I just ran the update scripts.
2022-01-13 15:08:41 -08:00
talyz
ae77e2fb78
discourse: Forward the used system and pkgs attributes to the tests
The system attribute is otherwise deduced from the system the
evaluation runs on, which could be incorrect if using remote
builders.
2021-12-23 10:34:27 +01:00
Ryan Mulligan
50832be998 discourse: 2.8.0.beta9 -> 2.8.0.beta10; update plugins 2021-12-21 15:40:12 -08:00
talyz
125bb7dac1
discourse: Don't patch the public path
Instead of patching the path to /public in Discourse's sources, make
the nginx configuration refer to the symlink in the discourse
package which points to the real path.

When there is a mismatch between the path nginx serves and the path
Discourse thinks it serves, we can run into issues like files not
being served - at least when sendfile requests from the ruby app are
processed by nginx. The issue I ran into most recently is that backup
downloads don't work.

Since Discourse refers to the public directory relative to the Rails
root in many places, it's much easier to just sync this path to the
nginx configuration than trying to patch all occurrences in the
sources. This should hopefully mean less potential for breakage in
future Discourse releases, too.
2021-12-06 14:21:39 +01:00
talyz
e2415dbb8f
discourse: 2.7.9 -> 2.8.0.beta9
Update to the latest beta, since upstream advocates for it. See
https://github.com/NixOS/nixpkgs/issues/146308 for more info.
2021-12-02 10:31:00 +01:00
TredwellGit
44ffcb8362 discourse: 2.7.8 -> 2.7.9
https://nvd.nist.gov/vuln/detail/CVE-2021-41163
2021-10-28 01:56:09 +00:00
talyz
1fb77e822b discourse: Fix the public directory path reported by Discourse
Change the path to the public directory reported by Discourse
to its real path instead of the symlink in the store, since
the store path won't be matched by any nginx rules.

Fixes #142528.
2021-10-22 23:38:53 +02:00
talyz
917a0cfe47
discourse: Make sure the notification email setting applies
Discourse normally overrides the default notification email setting,
which makes the `notificationEmailAddress` setting ineffective. Add a
patch to remove this override.

Fixes #140114.
2021-10-01 11:37:35 +02:00
Kim Lindberger
454f253acf
Merge pull request #139201 from talyz/discourse-2.7.8
discourse: 2.7.7 -> 2.7.8, update plugins
2021-09-27 15:33:48 +02:00
talyz
ed8c4e01d9
discourse: Enable jhead, which is no longer marked vulnerable 2021-09-27 09:58:45 +02:00
Ryan Mulligan
f933c68374 discourse: enable restoring backups bigger than RAM
When restoring a backup, discourse decompresses the backup archive in
the /share/discourse/tmp dir. Before this change, it is linked to /run
which is typically backed by memory, so the backup will fail to
restore if you do not have enough memory on your system to contain the
backup. This has already happened to me on two small forums.

This moves tmp to the StateDirectory /var/lib/discourse/tmp which is
typically backed by disk.
2021-09-23 09:59:31 -07:00
talyz
73e8eb91c1
discourse: 2.7.7 -> 2.7.8 2021-09-23 18:46:23 +02:00
talyz
04e6b03fa9
discourse.mkDiscoursePlugin: Handle repos with gems directories
Some plugin repos already have a `gems` directory. This lets the
packager choose whether it should be kept and the nix packaged ruby
gems should be copied into it or if it should be removed in favor of
our ruby gems.
2021-08-17 18:21:21 +02:00
talyz
443b318ee9
discourse: Change the path to the auto generated plugin assets
Change the path to the auto generated plugin assets, which defaults to
the plugin's directory and isn't writable at the time of asset
generation.
2021-08-17 18:21:03 +02:00
talyz
6fd5a40cca
discourse.tests: Test the appropriate discourse package
Perform the tests on the package that the `tests` attribute is a child
of, i.e. if `discourseAllPlugins.tests` is built, the tests will run
with the `discourseAllPlugins` package, not the `discourse` package as
previously.
2021-08-17 18:20:55 +02:00
talyz
bb14315d51
discourse: Remove leftover link to unused plugins directory 2021-08-17 18:17:56 +02:00
talyz
c97ae4ad8e
discourse: 2.7.5 -> 2.7.7 2021-08-17 18:17:27 +02:00
Robert Hensing
fbafeb7ad5 treewide: runCommandNoCC -> runCommand
This has been synonymous for ~5y.
2021-08-15 17:36:41 +02:00
Felix Buehler
4f62b05137 discourse.mkDiscoursePlugin: remove phases 2021-07-24 22:20:26 +02:00
talyz
60d78d7f1f
discourse: 2.7.4 -> 2.7.5 2021-07-14 13:18:23 +02:00
talyz
61f4429fbd
discourse: Use terser when building assets
Discourse prefers to use `terser` when building js assets, see
https://github.com/discourse/discourse/pull/12656. It still wants to
find `uglify-js` in order to not fall back to a ruby js compression
library, so let's keep it around for now. A fix for this has been
submitted upstream in
https://github.com/discourse/discourse/pull/13683.
2021-07-14 13:18:17 +02:00
talyz
3300282db3
discourse: Add update-plugins action to update.py 2021-07-14 13:17:55 +02:00
talyz
7671b90919
discourse: Add a proper plugin builder + a few initial packages
Some discourse plugins have Ruby dependencies and require a
specialized builder. This introduces a generic builder that can be
used whether the plugin has Ruby dependencies or not. It also adds a
set of pre-packaged plugins available through `discourse.plugins` and
provides an easy way to add more.
2021-06-24 20:54:14 +02:00
talyz
f0ae7fdf7e
discourse: Patch sources instead of using replace-literal 2021-06-24 19:38:25 +02:00
talyz
9af3672f4f
discourse: Fix plugin support
For plugins to work properly, their assets need to be precompiled
along with the rest of Discourse's assets. This means we need to build
new packages when the list of plugins change.
2021-06-24 19:38:19 +02:00
talyz
f7fb0d20a6
discourse: 2.7.0 -> 2.7.4 2021-06-15 18:19:59 +02:00
Ryan Mulligan
2dec0de3c0 nixos/discourse: Add rsync dependency
It is used for backup importing.
2021-05-28 17:43:02 -07:00
talyz
1f6b48be74 discourse: 2.6.5 -> 2.7.0 2021-05-28 17:43:02 -07:00
talyz
2db1ae068d
discourse: 2.6.3 -> 2.6.5 2021-04-16 14:20:56 +02:00
talyz
3c7df2a3cb
nixos/discourse: Add test 2021-04-05 13:55:44 +02:00
talyz
4d8c8f4722
discourse: init at 2.6.3 2021-04-05 13:54:06 +02:00