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

Merge staging-next into staging

parents bff6c679 387f5d9a

maintainers/maintainer-list.nix

+9 −0
Original line number Diff line number Diff line
@@ -6291,6 +6291,14 @@ 
    github = "higebu";

    githubId = 733288;

  };



  hikari = {

    email = "HikariNee@protonmail.com";

    github = "HikariNee";

    githubId = 72349937;

    name = "Hikari";

  };



  hiljusti = {

    name = "J.R. Hill";

    email = "hiljusti@so.dang.cool";
@@ -6303,6 +6311,7 @@ 
    githubId = 19825977;

    name = "Hiren Shah";

  };



  hiro98 = {

    email = "hiro@protagon.space";

    github = "vale981";

nixos/modules/services/backup/automysqlbackup.nix

+18 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
let



  inherit (lib) concatMapStringsSep concatStringsSep isInt isList literalExpression;

  inherit (lib) mapAttrs mapAttrsToList mkDefault mkEnableOption mkIf mkOption optional types;

  inherit (lib) mapAttrs mapAttrsToList mkDefault mkEnableOption mkIf mkOption mkRenamedOptionModule optional types;



  cfg = config.services.automysqlbackup;

  pkg = pkgs.automysqlbackup;
@@ -26,6 +26,10 @@ let 


in

{

  imports = [

    (mkRenamedOptionModule [ "services" "automysqlbackup" "config" ] [ "services" "automysqlbackup" "settings" ])

  ];



  # interface

  options = {

    services.automysqlbackup = {
@@ -40,7 +44,7 @@ in 
        '';

      };



      config = mkOption {

      settings = mkOption {

        type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);

        default = {};

        description = lib.mdDoc ''
@@ -112,7 +116,18 @@ in 


    services.mysql.ensureUsers = optional (config.services.mysql.enable && cfg.config.mysql_dump_host == "localhost") {

      name = user;

      ensurePermissions = { "*.*" = "SELECT, SHOW VIEW, TRIGGER, LOCK TABLES, EVENT"; };

      ensurePermissions = {

        "*.*" = "SELECT, SHOW VIEW, TRIGGER, LOCK TABLES, EVENT";



        # https://forums.mysql.com/read.php?10,668311,668315#msg-668315

        "function sys.extract_table_from_file_name" = "execute";

        "function sys.format_path" = "execute";

        "function sys.format_statement" = "execute";

        "function sys.extract_schema_from_file_name" = "execute";

        "function sys.ps_thread_account" = "execute";

        "function sys.format_time" = "execute";

        "function sys.format_bytes" = "execute";

      };

    };



  };

nixos/modules/services/networking/ssh/sshd.nix

+0 −3
Original line number Diff line number Diff line
@@ -365,9 +365,6 @@ in 
                "hmac-sha2-512-etm@openssh.com"

                "hmac-sha2-256-etm@openssh.com"

                "umac-128-etm@openssh.com"

                "hmac-sha2-512"

                "hmac-sha2-256"

                "umac-128@openssh.com"

              ];

              description = lib.mdDoc ''

                Allowed MACs

nixos/tests/mysql/mysql-replication.nix

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ let 
          enable = true;

          replication.role = "slave";

          replication.serverId = 2;

          replication.masterHost = nodes.primary.config.networking.hostName;

          replication.masterHost = nodes.primary.networking.hostName;

          replication.masterUser = replicateUser;

          replication.masterPassword = replicatePassword;

        };
@@ -54,7 +54,7 @@ let 
          enable = true;

          replication.role = "slave";

          replication.serverId = 3;

          replication.masterHost = nodes.primary.config.networking.hostName;

          replication.masterHost = nodes.primary.networking.hostName;

          replication.masterUser = replicateUser;

          replication.masterPassword = replicatePassword;

        };

pkgs/applications/maui/mauikit-imagetools.nix

+9 −0
Original line number Diff line number Diff line 
{ lib

, mkDerivation

, fetchpatch

, cmake

, extra-cmake-modules

, kconfig
@@ -16,6 +17,14 @@ 
mkDerivation {

  pname = "mauikit-imagetools";



  patches = [

    (fetchpatch {

      name = "remove-unused-method.patch";

      url = "https://invent.kde.org/maui/mauikit-imagetools/-/commit/344852044d407b144bca01c41a409ceaa548bec0.patch";

      hash = "sha256-Cpq/XzDgrKD8YVex2z9VxGTA+iDI5703+fHwkn0cIWA=";

    })

  ];



  nativeBuildInputs = [

    cmake

    extra-cmake-modules