Unverified Commit aa239dc2 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 5844313b 4e243a2e

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -2406,6 +2406,12 @@ 
    githubId = 51231053;

    name = "Daniel";

  };

  cadkin = {

    email = "cva@siliconslumber.net";

    name = "Cameron Adkins";

    github = "cadkin";

    githubId = 34077838;

  };

  cafkafk = {

    email = "christina@cafkafk.com";

    matrix = "@cafkafk:matrix.cafkafk.com";

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -1189,6 +1189,7 @@ 
  ./services/web-apps/komga.nix

  ./services/web-apps/lemmy.nix

  ./services/web-apps/limesurvey.nix

  ./services/web-apps/mainsail.nix

  ./services/web-apps/mastodon.nix

  ./services/web-apps/matomo.nix

  ./services/web-apps/mattermost.nix

nixos/modules/services/misc/moonraker.nix

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ in { 
        example = {

          authorization = {

            trusted_clients = [ "10.0.0.0/24" ];

            cors_domains = [ "https://app.fluidd.xyz" ];

            cors_domains = [ "https://app.fluidd.xyz" "https://my.mainsail.xyz" ];

          };

        };

        description = lib.mdDoc ''

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

0 → 100644
+66 −0
Original line number Diff line number Diff line 
{ config, lib, pkgs, ... }:

with lib;

let

  cfg = config.services.mainsail;

  moonraker = config.services.moonraker;

in

{

  options.services.mainsail = {

    enable = mkEnableOption (lib.mdDoc "a modern and responsive user interface for Klipper");



    package = mkOption {

      type = types.package;

      description = lib.mdDoc "Mainsail package to be used in the module";

      default = pkgs.mainsail;

      defaultText = literalExpression "pkgs.mainsail";

    };



    hostName = mkOption {

      type = types.str;

      default = "localhost";

      description = lib.mdDoc "Hostname to serve mainsail on";

    };



    nginx = mkOption {

      type = types.submodule

        (import ../web-servers/nginx/vhost-options.nix { inherit config lib; });

      default = { };

      example = literalExpression ''

        {

          serverAliases = [ "mainsail.''${config.networking.domain}" ];

        }

      '';

      description = lib.mdDoc "Extra configuration for the nginx virtual host of mainsail.";

    };

  };



  config = mkIf cfg.enable {

    services.nginx = {

      enable = true;

      upstreams.mainsail-apiserver.servers."${moonraker.address}:${toString moonraker.port}" = { };

      virtualHosts."${cfg.hostName}" = mkMerge [

        cfg.nginx

        {

          root = mkForce "${cfg.package}/share/mainsail";

          locations = {

            "/" = {

              index = "index.html";

              tryFiles = "$uri $uri/ /index.html";

            };

            "/index.html".extraConfig = ''

              add_header Cache-Control "no-store, no-cache, must-revalidate";

            '';

            "/websocket" = {

              proxyWebsockets = true;

              proxyPass = "http://mainsail-apiserver/websocket";

            };

            "~ ^/(printer|api|access|machine|server)/" = {

              proxyWebsockets = true;

              proxyPass = "http://mainsail-apiserver$request_uri";

            };

          };

        }

      ];

    };

  };

}

pkgs/applications/audio/faust/faust2.nix

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ let 




    passthru = {

      inherit wrap wrapWithBuildEnv;

      inherit wrap wrapWithBuildEnv faust2ApplBase;

    };