Unverified Commit 2d38540b authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 45b0e593 24c474ca

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -18345,6 +18345,12 @@ 
    githubId = 15896005;

    name = "Vladyslav Burzakovskyy";

  };

  mrsmoer = {

    email = "mrsmoer@protonmail.com";

    github = "MrSmoer";

    githubId = 66489839;

    name = "MrSmör";

  };

  MrSom3body = {

    email = "nix@sndh.dev";

    matrix = "@mrsom3body:matrix.org";

nixos/modules/programs/tsm-client.nix

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

      freeformType = attrsOf (either scalarType (listOf scalarType));

      # Client system-options file directives are explained here:

      # https://www.ibm.com/docs/en/storage-protect/8.1.27?topic=commands-processing-options

      # https://www.ibm.com/docs/en/storage-protect/8.2.1?topic=utilities-processing-options

      options.servername = mkOption {

        type = servernameType;

        default = name;

nixos/modules/services/backup/tsm.nix

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ in 
      environment.HOME = "/var/lib/tsm-backup";

      serviceConfig = {

        # for exit status description see

        # https://www.ibm.com/docs/en/storage-protect/8.1.27?topic=clients-client-return-codes

        # https://www.ibm.com/docs/en/storage-protect/8.2.1?topic=clients-client-return-codes

        SuccessExitStatus = "4 8";

        # The `-se` option must come after the command.

        # The `-optfile` option suppresses a `dsm.opt`-not-found warning.

nixos/tests/tsm-client-gui.nix

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
    # "Connection Information" dialog box

    machine.wait_for_window("Connection Information")

    machine.wait_for_text("SOME-NODE")

    machine.wait_for_text("${pkgs.tsm-client.passthru.unwrapped.version}")



    machine.shutdown()

  '';

pkgs/by-name/es/esphome/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -33,14 +33,14 @@ let 
in

python.pkgs.buildPythonApplication rec {

  pname = "esphome";

  version = "2026.3.2";

  version = "2026.3.3";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "esphome";

    repo = "esphome";

    tag = version;

    hash = "sha256-0v9K2zXIfp5Ka/DJarnVB4kmhgXh95Yvzm8Ts72eCZE=";

    hash = "sha256-yMPHz6IZIGM4oJw1wspEL3lIIiPv4WZALUJ7J1UWukY=";

  };



  patches = [