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

Merge master into staging-next

parents 7e5eff56 4c704748

doc/hooks/zig.section.md

+2 −2
Original line number Diff line number Diff line
@@ -9,14 +9,14 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases. 
```nix

{ lib

, stdenv

, zig_0_11

, zig

}:



stdenv.mkDerivation {

  # . . .



  nativeBuildInputs = [

    zig_0_11.hook

    zig.hook

  ];



  zigBuildFlags = [ "-Dman-pages=true" ];

lib/licenses.nix

+5 −0
Original line number Diff line number Diff line
@@ -632,6 +632,11 @@ in mkLicense lset) ({ 
    url = "https://old.calculate-linux.org/packages/licenses/iASL";

  };



  icu = {

    spdxId = "ICU";

    fullName = "ICU";

  };



  ijg = {

    spdxId = "IJG";

    fullName = "Independent JPEG Group License";

maintainers/maintainer-list.nix

+18 −0
Original line number Diff line number Diff line
@@ -429,6 +429,12 @@ 
    githubId = 1517066;

    name = "Aiken Cairncross";

  };

  a-camarillo = {

    name = "Anthony Camarillo";

    email = "anthony.camarillo.96@gmail.com";

    github = "a-camarillo";

    githubId = 58638902;

  };

  aciceri = {

    name = "Andrea Ciceri";

    email = "andrea.ciceri@autistici.org";
@@ -2943,6 +2949,12 @@ 
      fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E";

    }];

  };

  b-rodrigues = {

    email = "bruno@brodrigues.co";

    github = "b-rodrigues";

    githubId = 2998834;

    name = "Bruno Rodrigues";

  };

  broke = {

    email = "broke@in-fucking.space";

    github = "broke";
@@ -3018,6 +3030,12 @@ 
    githubId = 37375448;

    name = "Buildit";

  };

  buurro = {

    email = "marcoburro98@gmail.com";

    github = "buurro";

    githubId = 9320677;

    name = "Marco Burro";

  };

  bwc9876 = {

    email = "bwc9876@gmail.com";

    github = "Bwc9876";

maintainers/team-list.nix

+2 −0
Original line number Diff line number Diff line
@@ -854,8 +854,10 @@ with lib.maintainers; { 


  r = {

    members = [

      b-rodrigues

      bcdarwin

      jbedo

      kupac

    ];

    scope = "Maintain the R programming language and related packages.";

    shortName = "R";

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

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi 


- [PhotonVision](https://photonvision.org/), a free, fast, and easy-to-use computer vision solution for the FIRST® Robotics Competition.



- [clatd](https://github.com/toreanderson/clatd), a a CLAT / SIIT-DC Edge Relay implementation for Linux.



- [pyLoad](https://pyload.net/), a FOSS download manager written in Python. Available as [services.pyload](#opt-services.pyload.enable)



- [maubot](https://github.com/maubot/maubot), a plugin-based Matrix bot framework. Available as [services.maubot](#opt-services.maubot.enable).