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

Merge staging-next into staging

parents 561a54f3 f8283638

maintainers/maintainer-list.nix

+12 −0
Original line number Diff line number Diff line
@@ -6044,6 +6044,12 @@ 
    githubId = 2025623;

    name = "Luc Chabassier";

  };

  dwrege = {

    email = "email@dwrege.de";

    github = "dominicwrege";

    githubId = 7389000;

    name = "Dominic Wrege";

  };

  dxf = {

    email = "dingxiangfei2009@gmail.com";

    github = "dingxiangfei2009";
@@ -23060,6 +23066,12 @@ 
    githubId = 2856634;

    name = "Tyler Compton";

  };

  venikx = {

    email = "code@venikx.com";

    github = "venikx";

    githubId = 24815061;

    name = "Kevin De Baerdemaeker";

  };

  veprbl = {

    email = "veprbl@gmail.com";

    github = "veprbl";

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

+3 −1
Original line number Diff line number Diff line
@@ -900,7 +900,9 @@ 


- `freecad` now supports addons and custom configuration in nix-way, which can be used by calling `freecad.customize`.



## Detailed Migration Information {#sec-release-24.11-migration}

- `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries.



## Detailed migration information {#sec-release-24.11-migration}



### `sound` options removal {#sec-release-24.11-migration-sound}

nixos/modules/programs/obs-studio.nix

+13 −5
Original line number Diff line number Diff line
@@ -12,10 +12,13 @@ in 
  options.programs.obs-studio = {

    enable = lib.mkEnableOption "Free and open source software for video recording and live streaming";



    package = lib.mkPackageOption pkgs "obs-studio" { example = "obs-studio"; };

    package = lib.mkPackageOption pkgs "obs-studio" {

      nullable = true;

      example = "obs-studio";

    };



    finalPackage = lib.mkOption {

      type = lib.types.package;

      type = lib.types.nullOr lib.types.package;

      visible = false;

      readOnly = true;

      description = "Resulting customized OBS Studio package.";
@@ -39,11 +42,16 @@ in 
  };



  config = lib.mkIf cfg.enable {

    programs.obs-studio.finalPackage = pkgs.wrapOBS.override { obs-studio = cfg.package; } {

      plugins = cfg.plugins;

    assertions = lib.singleton {

      assertion = cfg.package == null -> cfg.plugins == [ ];

      message = "Plugins cannot be set if package is null";

    };



    environment.systemPackages = [ cfg.finalPackage ];

    programs.obs-studio.finalPackage = lib.mapNullable (

      obs-studio: pkgs.wrapOBS.override { inherit obs-studio; } { plugins = cfg.plugins; }

    ) cfg.package;



    environment.systemPackages = lib.optional (cfg.finalPackage != null) cfg.finalPackage;



    boot = lib.mkIf cfg.enableVirtualCamera {

      kernelModules = [ "v4l2loopback" ];

nixos/modules/services/networking/bind.nix

+1 −4
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ let 
        description = ''

          List of address ranges allowed to query this zone. Instead of the address(es), this may instead

          contain the single string "any".



          NOTE: This overrides the global-level `allow-query` setting, which is set to the contents

          of `cachenetworks`.

        '';

        default = [ "any" ];

      };
@@ -65,7 +62,7 @@ let 
      options {

        listen-on { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.listenOn} };

        listen-on-v6 { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.listenOnIpv6} };

        allow-query { cachenetworks; };

        allow-query-cache { cachenetworks; };

        blackhole { badnetworks; };

        forward ${cfg.forward};

        forwarders { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.forwarders} };

pkgs/applications/networking/browsers/librewolf/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ in 
  meta = {

    description = "Fork of Firefox, focused on privacy, security and freedom";

    homepage = "https://librewolf.net/";

    maintainers = with lib.maintainers; [ squalus ];

    maintainers = with lib.maintainers; [ squalus dwrege ];

    platforms = lib.platforms.unix;

    badPlatforms = lib.platforms.darwin;

    broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".