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

Merge master into staging-next

parents 01d7051d a603d123

ci/OWNERS

+2 −2
Original line number Diff line number Diff line
@@ -507,8 +507,8 @@ pkgs/servers/authelia/ @06kellyjac @dit7ya @nicomem 
pkgs/by-name/oc/octodns/ @anthonyroussel



# Teleport

/pkgs/build-support/teleport  @arianvp @justinas @sigma @tomberek @freezeboy @techknowlogick @JuliusFreudenberger

pkgs/by-name/te/teleport*     @arianvp @justinas @sigma @tomberek @freezeboy @techknowlogick @JuliusFreudenberger

/pkgs/build-support/teleport  @arianvp @justinas @sigma @tomberek @techknowlogick @JuliusFreudenberger

pkgs/by-name/te/teleport*     @arianvp @justinas @sigma @tomberek @techknowlogick @JuliusFreudenberger



# Warp-terminal

pkgs/by-name/wa/warp-terminal/  @emilytrau @imadnyc @FlameFlag @johnrtitor

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

+2 −0
Original line number Diff line number Diff line
@@ -287,6 +287,8 @@ 
  Use `python3Packages.ddgs` instead.

  See [release note for v9.0.0](https://github.com/deedy5/ddgs/releases/tag/v9.0.0)



- `ra-multiplex` has been renamed to/replaced by `lspmux`. Its wrapper no longer includes `rust-analyzer`.



## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}



<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

maintainers/maintainer-list.nix

+0 −5
Original line number Diff line number Diff line
@@ -8837,11 +8837,6 @@ 
    githubId = 32936898;

    name = "Wu Zhenyu";

  };

  freezeboy = {

    github = "freezeboy";

    githubId = 13279982;

    name = "freezeboy";

  };

  frenetic00 = {

    github = "frenetic00";

    githubId = 50942055;

nixos/modules/services/monitoring/traccar.nix

+3 −10
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ let 
      user = "sa";

    };

    logger.console = "true";

    media.path = "${stateDirectory}/media";

    templates.root = "${stateDirectory}/templates";

    web.override = "${stateDirectory}/override";

  };



in
@@ -95,11 +94,9 @@ in 
        wants = [ "network-online.target" ];



        preStart = ''

          # Copy new templates into our state directory.

          cp -a --update=none ${pkgs.traccar}/templates ${stateDirectory}

          test -f '${configFilePath}' && rm -f '${configFilePath}'



          # Substitute the configFile from Envvars read from EnvironmentFile

          # Perform envvars substition read from environmentFile

          old_umask=$(umask)

          umask 0177

          ${lib.getExe pkgs.envsubst} \
@@ -110,6 +107,7 @@ in 


        serviceConfig = {

          DynamicUser = true;

          WorkingDirectory = "${pkgs.traccar}";

          EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;

          ExecStart = "${lib.getExe pkgs.traccar} ${configFilePath}";

          LockPersonality = true;
@@ -132,11 +130,6 @@ in 
          StateDirectory = "traccar";

          SuccessExitStatus = 143;

          Type = "simple";

          # Set the working directory to traccar's package.

          # Traccar only searches for the DB migrations relative to it's WorkingDirectory and nothing worked to

          # work around this. To avoid copying the migrations over to the state directory, we use the package as

          # WorkingDirectory.

          WorkingDirectory = "${pkgs.traccar}";

        };

      };

    };

nixos/modules/services/security/tor.nix

+4 −2
Original line number Diff line number Diff line
@@ -456,6 +456,8 @@ in 


      package = lib.mkPackageOption pkgs "tor" { };



      obfs4Package = lib.mkPackageOption pkgs "obfs4" { };



      enableGeoIP =

        lib.mkEnableOption ''

          use of GeoIP databases.
@@ -1253,7 +1255,7 @@ in 
              BridgeRelay = true;

              ExtORPort.port = lib.mkDefault "auto";

              ServerTransportPlugin.transports = lib.mkDefault [ "obfs4" ];

              ServerTransportPlugin.exec = lib.mkDefault "${lib.getExe pkgs.obfs4} managed";

              ServerTransportPlugin.exec = lib.mkDefault "${lib.getExe cfg.obfs4Package} managed";

            }

        // lib.optionalAttrs (cfg.relay.role == "private-bridge") {

          ExtraInfoStatistics = false;
@@ -1326,7 +1328,7 @@ in 
    systemd.services.tor = {

      description = "Tor Daemon";

      documentation = [ "man:tor(8)" ];

      path = [ pkgs.tor ];

      path = [ cfg.package ];



      wantedBy = [ "multi-user.target" ];

      after = [ "network.target" ];