discourse: 3.4.4 -> 3.4.6 (#430928) (8eb7a941) · Commits · nix / nixpkgs

nixos/modules/services/web-apps/discourse.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -733,14 +733,14 @@ in
		after = [
		"redis-discourse.service"
		"postgresql.target"
		"discourse-postgresql.target"
		"discourse-postgresql.service"
		];
		bindsTo = [
		"redis-discourse.service"
		]
		++ lib.optionals (cfg.database.host == null) [
		"postgresql.target"
		"discourse-postgresql.target"
		"discourse-postgresql.service"
		];
		path = cfg.package.runtimeDeps ++ [
		postgresqlPackage

+8 −1

Original line number	Diff line number	Diff line
		@@ -422,7 +422,14 @@ in
		dex-oidc = runTest ./dex-oidc.nix;
		dhparams = runTest ./dhparams.nix;
		disable-installer-tools = runTest ./disable-installer-tools.nix;
		discourse = runTest ./discourse.nix;
		discourse = runTest {
		imports = [ ./discourse.nix ];
		_module.args.package = pkgs.discourse;
		};
		discourseAllPlugins = runTest {
		imports = [ ./discourse.nix ];
		_module.args.package = pkgs.discourseAllPlugins;
		};
		dnscrypt-proxy2 = runTestOn [ "x86_64-linux" ] ./dnscrypt-proxy2.nix;
		dnsdist = import ./dnsdist.nix { inherit pkgs runTest; };
		doas = runTest ./doas.nix;

+2 −4

Original line number	Diff line number	Diff line
		@@ -4,9 +4,9 @@
		# 3. replying to that message via email.

		{
		lib,
		package,
		pkgs,
		lib,
		...
		}:
		let
		@@ -26,8 +26,6 @@ in
		name = "discourse";
		meta.maintainers = with lib.maintainers; [ talyz ];

		_module.args.package = lib.mkDefault pkgs.discourse;

		nodes.discourse =
		{ nodes, ... }:
		{
		@@ -62,7 +60,7 @@ in

		services.discourse = {
		enable = true;
		inherit admin;
		inherit admin package;
		hostname = discourseDomain;
		sslCertificate = "${certs.${discourseDomain}.cert}";
		sslCertificateKey = "${certs.${discourseDomain}.key}";

+9 −9

Original line number	Diff line number	Diff line
		@@ -8,9 +8,9 @@
		fetchFromGitHub,
		bundlerEnv,
		callPackage,
		nixosTests,

		ruby_3_3,
		replace,
		gzip,
		gnutar,
		git,
		@@ -43,16 +43,16 @@
		uglify-js,

		plugins ? [ ],
		}@args:
		}:

		let
		version = "3.4.4";
		version = "3.4.6";

		src = fetchFromGitHub {
		owner = "discourse";
		repo = "discourse";
		rev = "v${version}";
		sha256 = "sha256-rA42fOhSJVrNPcFSB2+On7JVeZch8t2yNo+36UK+QcA=";
		sha256 = "sha256-HS13jNhSrPo7CHAk2zZEKSt54lBTw1PdMCIJUO0rjLc=";
		};

		ruby = ruby_3_3;
		@@ -433,13 +433,13 @@ let
		enabledPlugins = plugins;
		plugins = callPackage ./plugins/all-plugins.nix { inherit mkDiscoursePlugin; };
		ruby = rubyEnv.wrappedRuby;
		tests = import ../../../../nixos/tests/discourse.nix {
		inherit (stdenv) system;
		inherit pkgs;
		package = pkgs.discourse.override args;
		tests = {
		inherit (nixosTests)
		discourse
		discourseAllPlugins
		;
		};
		};

		meta = with lib; {
		homepage = "https://www.discourse.org/";
		platforms = platforms.linux;

+1 −1