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

Merge master into staging-next

parents 40938cc5 f7a8b887

maintainers/maintainer-list.nix

+21 −0
Original line number Diff line number Diff line
@@ -4838,6 +4838,12 @@ 
    githubId = 4708206;

    name = "Daniel Fox Franke";

  };

  dghubble = {

    email = "dghubble@gmail.com";

    github = "dghubble";

    githubId = 2253428;

    name = "Dalton Hubble";

  };

  dgliwka = {

    email = "dawid.gliwka@gmail.com";

    github = "dgliwka";
@@ -16188,6 +16194,15 @@ 
    githubId = 104558;

    name = "Benjamin Saunders";

  };

  ramblurr = {

    name = "Casey Link";

    email = "nix@caseylink.com";

    github = "Ramblurr";

    githubId = 14830;

    keys = [{

      fingerprint = "978C 4D08 058B A26E B97C  B518 2078 2DBC ACFA ACDA";

    }];

  };

  ramkromberg = {

    email = "ramkromberg@mail.com";

    github = "RamKromberg";
@@ -19077,6 +19092,12 @@ 
    githubId = 321799;

    name = "Paul Colomiets";

  };

  takac = {

    email = "cammann.tom@gmail.com";

    github = "takac";

    githubId = 1015381;

    name = "Tom Cammann";

  };

  takagiy = {

    email = "takagiy.4dev@gmail.com";

    github = "takagiy";

nixos/doc/manual/configuration/x-windows.chapter.md

+4 −6
Original line number Diff line number Diff line
@@ -146,14 +146,12 @@ default because it's not free software. You can enable it as follows: 
services.xserver.videoDrivers = [ "nvidia" ];

```



Or if you have an older card, you may have to use one of the legacy

drivers:

If you have an older card, you may have to use one of the legacy drivers:



```nix

services.xserver.videoDrivers = [ "nvidiaLegacy470" ];

services.xserver.videoDrivers = [ "nvidiaLegacy390" ];

services.xserver.videoDrivers = [ "nvidiaLegacy340" ];

services.xserver.videoDrivers = [ "nvidiaLegacy304" ];

hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470;

hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_390;

hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_340;

```



You may need to reboot after enabling this driver to prevent a clash

nixos/doc/manual/release-notes/rl-2405.section.md

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 


- [Pretix](https://pretix.eu/about/en/), an open source ticketing software for events. Available as [services.pretix]($opt-services-pretix.enable).



- [microsocks](https://github.com/rofl0r/microsocks), a tiny, portable SOCKS5 server with very moderate resource usage. Available as [services.microsocks]($opt-services-microsocks.enable).



- [Clevis](https://github.com/latchset/clevis), a pluggable framework for automated decryption, used to unlock encrypted devices in initrd. Available as [boot.initrd.clevis.enable](#opt-boot.initrd.clevis.enable).



- [fritz-exporter](https://github.com/pdreker/fritz_exporter), a Prometheus exporter for extracting metrics from [FRITZ!](https://avm.de/produkte/) devices. Available as [services.prometheus.exporters.fritz](#opt-services.prometheus.exporters.fritz.enable).

nixos/modules/hardware/video/nvidia.nix

+11 −2
Original line number Diff line number Diff line
@@ -396,6 +396,9 @@ in { 
            modules = [nvidia_x11.bin];

            display = !offloadCfg.enable;

            deviceSection =

              ''

                Option "SidebandSocketPath" "/run/nvidia-xdriver/"

              '' +

              lib.optionalString primeEnabled

              ''

                BusID "${pCfg.nvidiaBusId}"
@@ -533,8 +536,14 @@ in { 


        hardware.firmware = lib.optional cfg.open nvidia_x11.firmware;



        systemd.tmpfiles.rules =

          lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia)

        systemd.tmpfiles.rules = [

          # Remove the following log message:

          #    (WW) NVIDIA: Failed to bind sideband socket to

          #    (WW) NVIDIA:     '/var/run/nvidia-xdriver-b4f69129' Permission denied

          #

          # https://bbs.archlinux.org/viewtopic.php?pid=1909115#p1909115

          "d /run/nvidia-xdriver 0770 root users"

        ] ++ lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia)

          "L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced";



        boot = {

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -1020,6 +1020,7 @@ 
  ./services/networking/lxd-image-server.nix

  ./services/networking/magic-wormhole-mailbox-server.nix

  ./services/networking/matterbridge.nix

  ./services/networking/microsocks.nix

  ./services/networking/mihomo.nix

  ./services/networking/minidlna.nix

  ./services/networking/miniupnpd.nix