Unverified Commit a4cadd9c authored by Martin Weinelt's avatar Martin Weinelt
Browse files

discourse: fix passthru nixos test

parent 7db4feef

nixos/tests/all-tests.nix

+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;

nixos/tests/discourse.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}";

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

+7 −7
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 
  fetchFromGitHub,

  bundlerEnv,

  callPackage,

  nixosTests,



  ruby_3_3,

  replace,

  gzip,

  gnutar,

  git,
@@ -43,7 +43,7 @@ 
  uglify-js,



  plugins ? [ ],

}@args:

}:



let

  version = "3.4.6";
@@ -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;