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

Merge staging-next into staging

parents dda6efbb 02bde57e

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -22924,6 +22924,12 @@ 
    githubId = 92817635;

    name = "Sanskar Gurdasani";

  };

  santosh = {

    email = "santoshxshrestha@gmail.com";

    name = "Santosh Shrestha";

    github = "santoshxshrestha";

    githubId = 182977126;

  };

  sarahec = {

    email = "seclark@nextquestion.net";

    github = "sarahec";

nixos/modules/services/networking/hostapd.nix

+10 −15
Original line number Diff line number Diff line
@@ -1334,26 +1334,21 @@ in 
        # we check if wirelessInterfaces is empty as that means all interfaces implicit

        shouldWarn = wirelessEnabled && (wirelessInterfaces == [ ] || hasInterfaceConflict);

      in

      if shouldWarn then

        [

          ''

      lib.optional shouldWarn ''

        Some wireless interface is configured for both for client and access point mode:

        this is not allowed. Either specify `networking.wireless.interfaces` and exclude

        those from `services.hostapd.radios` or make sure to not run the `wpa_supplicant`

        and `hostapd` services simultaneously.

      ''

        ]

      else

        [ ];

      ++ lib.optional config.networking.wireless.iwd.enable ''

        hostapd and iwd do conflict,

        use `networking.wireless.enable` in combination with `networking.wireless.interfaces` to avoid it.

      '';

    assertions = [

      {

        assertion = cfg.radios != { };

        message = "At least one radio must be configured with hostapd!";

      }

      {

        assertion = !config.networking.wireless.iwd.enable;

        message = "hostapd and iwd conflict, use `networking.wireless.enable` in combination with `networking.wireless.interfaces`";

      }

    ]

    # Radio warnings

    ++ (concatLists (

nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py

+5 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ import re 
import shutil

import subprocess

import sys

import tempfile

import warnings

import json

from typing import NamedTuple, Any, Sequence
@@ -64,7 +65,10 @@ class SystemIdentifier(NamedTuple): 


def copy_if_not_exists(source: Path, dest: Path) -> None:

    if not dest.exists():

        shutil.copyfile(source, dest)

        tmpfd, tmppath = tempfile.mkstemp(dir=dest.parent, prefix=dest.name, suffix='.tmp.')

        shutil.copyfile(source, tmppath)

        os.fsync(tmpfd)

        shutil.move(tmppath, dest)





def generation_dir(profile: str | None, generation: int) -> Path:

pkgs/applications/networking/browsers/firefox-bin/release_sources.nix

+825 −825

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ 


buildMozillaMach rec {

  pname = "firefox";

  version = "140.3.0esr";

  version = "140.3.1esr";

  applicationName = "Firefox ESR";

  src = fetchurl {

    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

    sha512 = "f2a45352372a7c54bfc3a07652098b55634d111ea88550d33e7e2710d15524d689ee39fbd3b2049643436530e13c237d03e05fb7abd3970c9c18b66e5a84c85a";

    sha512 = "a9302d99d7f07f4b250aa214635814964dd083204268e05fe877a3d8330b9c0caa6c29ed19da71bd88979b7cf39ed52f17698968b0da5b0d7430b6764b43b6cc";

  };



  meta = {