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

Merge staging-next-24.11 into staging-24.11

parents a2665307 4f44a5cb

doc/stdenv/platform-notes.chapter.md

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ These paths will need to be replaced with relative paths and the xcbuild package 
stdenv.mkDerivation {

  name = "libfoo-1.2.3";

  postPatch = ''

    subsituteInPlace Makefile \

    substituteInPlace Makefile \

      --replace-fail '/usr/bin/xcodebuild' 'xcodebuild' \

      --replace-fail '/usr/bin/xcrun' 'xcrun' \

      --replace-fail '/usr/bin/PListBuddy' 'PListBuddy'

doc/using/configuration.chapter.md

+4 −2
Original line number Diff line number Diff line
@@ -154,11 +154,13 @@ There are several ways to tweak how Nix handles a package which has been marked 


    The `allowInsecurePredicate` option is a function which accepts a package and returns a boolean, much like `allowUnfreePredicate`.



    The following configuration example only allows insecure packages with very short names:

    The following configuration example allows any version of the `ovftool` package:



    ```nix

    {

      allowInsecurePredicate = pkg: builtins.stringLength (lib.getName pkg) <= 5;

      allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) [

        "ovftool"

      ];

    }

    ```

maintainers/maintainer-list.nix

+8 −0
Original line number Diff line number Diff line
@@ -12720,6 +12720,14 @@ 
    githubId = 5624721;

    name = "Ben Wolsieffer";

  };

  lordmzte = {

    name = "Moritz Thomae";

    email = "lord@mzte.de";

    matrix = "@lordmzte:mzte.de";

    github = "LordMZTE";

    githubId = 28735087;

    keys = [ { fingerprint = "AB47 3D70 53D2 74CA DC2C  230C B648 02DC 33A6 4FF6"; } ];

  };

  lord-valen = {

    name = "Lord Valen";

    matrix = "@lord-valen:matrix.org";

nixos/modules/module-list.nix

+2 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ 
  ./programs/alvr.nix

  ./programs/appgate-sdp.nix

  ./programs/appimage.nix

  ./programs/arp-scan.nix

  ./programs/atop.nix

  ./programs/ausweisapp.nix

  ./programs/autojump.nix
@@ -296,6 +297,7 @@ 
  ./programs/sysdig.nix

  ./programs/system-config-printer.nix

  ./programs/systemtap.nix

  ./programs/tcpdump.nix

  ./programs/thefuck.nix

  ./programs/thunar.nix

  ./programs/thunderbird.nix

nixos/modules/programs/arp-scan.nix

0 → 100644
+32 −0
Original line number Diff line number Diff line 
{

  config,

  lib,

  pkgs,

  ...

}:



let

  cfg = config.programs.arp-scan;

in

{

  options = {

    programs.arp-scan = {

      enable = lib.mkOption {

        type = lib.types.bool;

        default = false;

        description = ''

          Whether to configure a setcap wrapper for arp-scan.

        '';

      };

    };

  };



  config = lib.mkIf cfg.enable {

    security.wrappers.arp-scan = {

      owner = "root";

      group = "root";

      capabilities = "cap_net_raw+p";

      source = lib.getExe pkgs.arp-scan;

    };

  };

}