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

Merge master into staging-next

parents ce0844a5 c6663c63

doc/doc-support/python-interpreter-table.nix

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ let 


in

writeText "python-interpreter-table.md" ''

  | Package | Aliases | Interpeter |

  |---------|---------|------------|

  | Package | Aliases | Interpreter |

  |---------|---------|-------------|

  ${toMarkdown result}

''

doc/languages-frameworks/python.section.md

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ sets are 
* `pkgs.python312Packages`

* `pkgs.python313Packages`

* `pkgs.python314Packages`

* `pkgs.python315Packages`

* `pkgs.pypy27Packages`

* `pkgs.pypy310Packages`

maintainers/maintainer-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -14897,7 +14897,7 @@ 
    name = "Isaac Silverstein";

  };

  loicreynier = {

    email = "loic@loicreynier.fr";

    email = "contact@loicreynier.fr";

    github = "loicreynier";

    githubId = 88983487;

    name = "Loïc Reynier";

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

+2 −0
Original line number Diff line number Diff line
@@ -325,6 +325,8 @@ 


- `services.dnscrypt-proxy` gains a `package` option to specify dnscrypt-proxy package to use.



- `services.limesurvey` now supports nginx as reverse-proxy. Available through [services.limesurvey.webserver](#opt-services.limesurvey.webserver).



- `services.nextcloud.configureRedis` now defaults to `true` in accordance with upstream recommendations to have caching for file locking. See the [upstream doc](https://docs.nextcloud.com/server/31/admin_manual/configuration_files/files_locking_transactional.html) for further details.



- mate-wayland-session 1.28.4 is now using the default wayfire decorator instead of firedecor, thus `services.xserver.desktopManager.mate.enableWaylandSession` is no longer shipping firedecor. If you are experiencing broken window decorations after upgrade, backup and remove `~/.config/mate/wayfire.ini` and re-login.

nixos/modules/services/security/tsidp.nix

+6 −3
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ let 
    nullOr

    ;



  stateDir = "/var/lib/tsidp";



  cfg = config.services.tsidp;

in

{
@@ -154,7 +156,7 @@ in 
        ];



        environment = {

          HOME = "/var/lib/tsidp";

          HOME = stateDir;

          TAILSCALE_USE_WIP_CODE = "1"; # Needed while tsidp is in development (< v1.0.0).

        };
@@ -163,6 +165,7 @@ in 
          ExecStart =

            let

              args = lib.cli.toGNUCommandLineShell { mkOptionName = k: "-${k}"; } {

                dir = stateDir;

                hostname = cfg.settings.hostName;

                port = cfg.settings.port;

                local-port = cfg.settings.localPort;
@@ -179,8 +182,8 @@ in 
          RestartSec = "15";



          DynamicUser = true;

          StateDirectory = "tsidp";

          WorkingDirectory = "/var/lib/tsidp";

          StateDirectory = baseNameOf stateDir;

          WorkingDirectory = stateDir;

          ReadWritePaths = mkIf (cfg.settings.useLocalTailscaled) [

            "/var/run/tailscale" # needed due to `ProtectSystem = "strict";`

            "/var/lib/tailscale"