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

Merge master into staging-next

parents 1856b324 761426d3

doc/languages-frameworks/python.section.md

+4 −0
Original line number Diff line number Diff line
@@ -2014,6 +2014,10 @@ example of such a situation is when `py.test` is used. 


* Tests that attempt to access `$HOME` can be fixed by using the following

  work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)`

* Compiling with Cython causes tests to fail with a `ModuleNotLoadedError`.

  This can be fixed with two changes in the derivation: 1) replacing `pytest` with

  `pytestCheckHook` and 2) adding a `preCheck` containing `cd $out` to run

  tests within the built output.



## Contributing {#contributing}

maintainers/maintainer-list.nix

+20 −0
Original line number Diff line number Diff line
@@ -761,6 +761,11 @@ 
    githubId = 786394;

    name = "Alexander Krupenkin ";

  };

  akshayka = {

    github = "akshayka";

    githubId = 1994308;

    name = "Akshay Agrawal";

  };

  akshgpt7 = {

    email = "akshgpt7@gmail.com";

    github = "akshgpt7";
@@ -5005,6 +5010,12 @@ 
    githubId = 283316;

    name = "Dane Lipscombe";

  };

  dmadisetti = {

    email = "nix@madisetti.me";

    github = "dmadisetti";

    githubId = 2689338;

    name = "Dylan Madisetti";

  };

  dmalikov = {

    email = "malikov.d.y@gmail.com";

    github = "dmalikov";
@@ -9956,6 +9967,15 @@ 
    githubId = 1621930;

    name = "Kamil Chmielewski";

  };

  kamillaova = {

    name = "Kamilla Ova";

    email = "me@kamillaova.dev";

    github = "Kamillaova";

    githubId = 54859825;

    keys = [{

      fingerprint = "B2D0 AA53 8DBE 60B0 0811  3FC0 2D52 5F67 791E 5834";

    }];

  };

  kampfschlaefer = {

    email = "arnold@arnoldarts.de";

    github = "kampfschlaefer";

maintainers/scripts/luarocks-packages.csv

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ magick,,,,,5.1,donovanglover 
markdown,,,,,,

mediator_lua,,,,,,

middleclass,,,,,,

mimetypes,,,,,,

mpack,,,,,,

moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn

nlua,,,,,,teto

nixos/modules/services/networking/dnscache.nix

+5 −1
Original line number Diff line number Diff line
@@ -86,7 +86,11 @@ in { 


  config = mkIf config.services.dnscache.enable {

    environment.systemPackages = [ pkgs.djbdns ];

    users.users.dnscache.isSystemUser = true;

    users.users.dnscache = {

        isSystemUser = true;

        group = "dnscache";

    };

    users.groups.dnscache = {};



    systemd.services.dnscache = {

      description = "djbdns dnscache server";

nixos/modules/services/x11/xserver.nix

+1 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ in 
    boot.kernel.sysctl."fs.inotify.max_user_instances" = mkDefault 524288;

    boot.kernel.sysctl."fs.inotify.max_user_watches" = mkDefault 524288;



    programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gnome3;

    programs.gnupg.agent.pinentryPackage = lib.mkOverride 1100 pkgs.pinentry-gnome3;



    systemd.defaultUnit = mkIf cfg.autorun "graphical.target";