Unverified Commit 83b8726e authored by Alyssa Ross's avatar Alyssa Ross
Browse files

Merge remote-tracking branch 'origin/master' into staging-next 

Conflicts:
	pkgs/development/python-modules/velbus-aio/default.nix
parents 538bce24 95e6dfd5

doc/languages-frameworks/python.section.md

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
| python310  | python3         | CPython 3.10 |

| python311  |                 | CPython 3.11 |

| python312  |                 | CPython 3.12 |

| python313  |                 | CPython 3.13 |

| pypy27     | pypy2, pypy     | PyPy2.7 |

| pypy39     | pypy3           | PyPy 3.9 |

maintainers/maintainer-list.nix

+28 −0
Original line number Diff line number Diff line
@@ -1274,6 +1274,9 @@ 
    github = "antonmosich";

    githubId = 27223336;

    name = "Anton Mosich";

    keys = [ {

      fingerprint = "F401 287C 324F 0A1C B321  657B 9B96 97B8 FB18 7D14";

    } ];

  };

  antono = {

    email = "self@antono.info";
@@ -3874,6 +3877,12 @@ 
    githubId = 50051176;

    name = "Daniel Rolls";

  };

  danielsidhion = {

    email = "nixpkgs@sidhion.com";

    github = "DanielSidhion";

    githubId = 160084;

    name = "Daniel Sidhion";

  };

  daniyalsuri6 = {

    email = "daniyal.suri@gmail.com";

    github = "daniyalsuri6";
@@ -7225,6 +7234,7 @@ 
  };

  hubble = {

    name = "Hubble the Wolverine";

    email = "hubblethewolverine@gmail.com";

    matrix = "@hubofeverything:bark.lgbt";

    github = "the-furry-hubofeverything";

    githubId = 53921912;
@@ -10929,6 +10939,12 @@ 
    githubId = 29855073;

    name = "Michael Colicchia";

  };

  massimogengarelli = {

    email = "massimo.gengarelli@gmail.com";

    github = "massix";

    githubId = 585424;

    name = "Massimo Gengarelli";

  };

  matejc = {

    email = "cotman.matej@gmail.com";

    github = "matejc";
@@ -13916,6 +13932,12 @@ 
    githubId = 610615;

    name = "Chih-Mao Chen";

  };

  pks = {

    email = "ps@pks.im";

    github = "pks-t";

    githubId = 4056630;

    name = "Patrick Steinhardt";

  };

  plabadens = {

    name = "Pierre Labadens";

    email = "labadens.pierre+nixpkgs@gmail.com";
@@ -17810,6 +17832,12 @@ 
    githubId = 858790;

    name = "Tobias Mayer";

  };

  tochiaha = {

    email = "tochiahan@proton.me";

    github = "Tochiaha";

    githubId = 74688871;

    name = "Tochukwu Ahanonu";

  };

  tokudan = {

    email = "git@danielfrank.net";

    github = "tokudan";

maintainers/scripts/luarocks-packages.csv

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,, 
digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3,

dkjson,,,,,,

fennel,,,,,,misterio77

ferris.nvim,,,,,,mrcjkb

fifo,,,,,,

fluent,,,,,,alerque

gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1,

nixos/lib/test-driver/test_driver/machine.py

+22 −0
Original line number Diff line number Diff line
@@ -791,6 +791,28 @@ class Machine: 
        with self.nested(f"waiting for TCP port {port} on {addr}"):

            retry(port_is_open, timeout)



    def wait_for_open_unix_socket(

        self, addr: str, is_datagram: bool = False, timeout: int = 900

    ) -> None:

        """

        Wait until a process is listening on the given UNIX-domain socket

        (default to a UNIX-domain stream socket).

        """



        nc_flags = [

            "-z",

            "-uU" if is_datagram else "-U",

        ]



        def socket_is_open(_: Any) -> bool:

            status, _ = self.execute(f"nc {' '.join(nc_flags)} {addr}")

            return status == 0



        with self.nested(

            f"waiting for UNIX-domain {'datagram' if is_datagram else 'stream'} on '{addr}'"

        ):

            retry(socket_is_open, timeout)



    def wait_for_closed_port(

        self, port: int, addr: str = "localhost", timeout: int = 900

    ) -> None:

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -1154,6 +1154,7 @@ 
  ./services/security/hologram-agent.nix

  ./services/security/hologram-server.nix

  ./services/security/infnoise.nix

  ./services/security/jitterentropy-rngd.nix

  ./services/security/kanidm.nix

  ./services/security/munge.nix

  ./services/security/nginx-sso.nix