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

Merge master into staging-next

parents 2d936f57 73bb5041

doc/languages-frameworks/php.section.md

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ wide variety of extensions and libraries available. 


The different versions of PHP that nixpkgs provides are located under

attributes named based on major and minor version number; e.g.,

`php81` is PHP 8.1.

`php84` is PHP 8.4.



Only versions of PHP that are supported by upstream for the entirety

of a given NixOS release will be included in that release of
@@ -22,8 +22,8 @@ NixOS - not necessarily the latest major release from upstream. 


All available PHP attributes are wrappers around their respective

binary PHP package and provide commonly used extensions this way. The

real PHP 8.1 package, i.e. the unwrapped one, is available as

`php81.unwrapped`; see the next section for more details.

real PHP 8.4 package, i.e. the unwrapped one, is available as

`php84.unwrapped`; see the next section for more details.



Interactive tools built on PHP are put in `php.packages`; composer is

for example available at `php.packages.composer`.

lib/licenses.nix

+50 −0
Original line number Diff line number Diff line
@@ -167,6 +167,11 @@ lib.mapAttrs mkLicense ( 
      fullName = "Apache License 2.0";

    };



    baekmuk = {

      spdxId = "Baekmuk";

      fullName = "Baekmuk License";

    };



    bitstreamVera = {

      spdxId = "Bitstream-Vera";

      fullName = "Bitstream Vera Font License";
@@ -182,6 +187,11 @@ lib.mapAttrs mkLicense ( 
      fullName = " BitTorrent Open Source License v1.1";

    };



    boehmGC = {

      spdxId = "Boehm-GC";

      fullName = "Boehm-Demers-Weiser GC License";

    };



    bola11 = {

      url = "https://blitiri.com.ar/p/bola/";

      fullName = "Buena Onda License Agreement 1.1";
@@ -591,6 +601,11 @@ lib.mapAttrs mkLicense ( 
      free = false;

    };



    fontException = {

      spdxId = "Font-exception-2.0";

      fullName = "Font exception 2.0";

    };



    fraunhofer-fdk = {

      fullName = "Fraunhofer FDK AAC Codec Library";

      spdxId = "FDK-AAC";
@@ -600,6 +615,11 @@ lib.mapAttrs mkLicense ( 
      fullName = "Unspecified free software license";

    };



    freeimage = {

      spdxId = "FreeImage";

      fullName = "FreeImage Public License v1.0";

    };



    fsl11Mit = {

      fullName = "Functional Source License, Version 1.1, MIT Future License";

      spdxId = "FSL-1.1-MIT";
@@ -771,6 +791,11 @@ lib.mapAttrs mkLicense ( 
      free = false;

    };



    interbase = {

      spdxId = "Interbase-1.0";

      fullName = "Interbase Public License v1.0";

    };



    ipa = {

      spdxId = "IPA";

      fullName = "IPA Font License";
@@ -1047,6 +1072,11 @@ lib.mapAttrs mkLicense ( 
      redistributable = true; # Only if used in Netdata products.

    };



    ngpl = {

      spdxId = "NGPL";

      fullName = "Nethack General Public License";

    };



    nistSoftware = {

      spdxId = "NIST-Software";

      fullName = "NIST Software License";
@@ -1139,6 +1169,11 @@ lib.mapAttrs mkLicense ( 
      fullName = "Open Software License 3.0";

    };



    paratype = {

      fullName = "ParaType Free Font Licensing Agreement";

      url = "https://web.archive.org/web/20161209023955/http://www.paratype.ru/public/pt_openlicense_eng.asp";

    };



    parity70 = {

      spdxId = "Parity-7.0.0";

      fullName = "Parity Public License 7.0.0";
@@ -1267,6 +1302,11 @@ lib.mapAttrs mkLicense ( 
      redistributable = false; # only free to redistribute "for non-commercial purposes"

    };



    tcpWrappers = {

      spdxId = "TCP-wrappers";

      fullName = "TCP Wrappers License";

    };



    teamspeak = {

      fullName = "Teamspeak client license";

      url = "https://www.teamspeak.com/en/privacy-and-terms/";
@@ -1314,6 +1354,11 @@ lib.mapAttrs mkLicense ( 
      # https://github.com/spdx/license-list-XML/issues/2757

    };



    torque11 = {

      spdxId = "TORQUE-1.1";

      fullName = "TORQUE v2.5+ Software License v1.1";

    };



    tsl = {

      shortName = "TSL";

      fullName = "Timescale License Agreegment";
@@ -1454,6 +1499,11 @@ lib.mapAttrs mkLicense ( 
      fullName = "X11 License";

    };



    xerox = {

      spdxId = "Xerox";

      fullName = "Xerox License";

    };



    xfig = {

      spdxId = "Xfig";

      fullName = "xfig";

lib/sources.nix

+8 −1
Original line number Diff line number Diff line
@@ -44,7 +44,14 @@ let 
        baseName == ".git"

        ||

          type == "directory"

          && (baseName == ".svn" || baseName == "CVS" || baseName == ".hg" || baseName == ".jj")

          && (

            baseName == ".svn"

            || baseName == "CVS"

            || baseName == ".hg"

            || baseName == ".jj"

            || baseName == ".pijul"

            || baseName == "_darcs"

          )

      )

      ||

        # Filter out editor backup / swap files.

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

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ In addition to numerous new and upgraded packages, this release has the followin 


- [sx](https://github.com/earnestly/sx), a simple alternative to both xinit and startx for starting a Xorg server. Available as [services.xserver.displayManager.sx](#opt-services.xserver.displayManager.sx.enable)



- [postfixadmin](https://postfixadmin.sourceforge.io/), a web based virtual user administration interface for Postfix mail servers. Available as [postfixadmin](#opt-services.postfixadmin.enable).

- [postfixadmin](https://postfixadmin.sourceforge.io/), a web based virtual user administration interface for Postfix mail servers.



- [prowlarr](https://wiki.servarr.com/prowlarr), an indexer manager/proxy built on the popular arr .net/reactjs base stack [services.prowlarr](#opt-services.prowlarr.enable).

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

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ In addition to numerous new and upgraded packages, this release has the followin 


- [input-remapper](https://github.com/sezanzeb/input-remapper), an easy to use tool to change the mapping of your input device buttons. Available at [services.input-remapper](#opt-services.input-remapper.enable).



- [InvoicePlane](https://invoiceplane.com), web application for managing and creating invoices. Available at [services.invoiceplane](#opt-services.invoiceplane.sites._name_.enable).

- [InvoicePlane](https://invoiceplane.com), web application for managing and creating invoices. Available at `services.invoiceplane`.



- [k3b](https://userbase.kde.org/K3b), the KDE disk burning application. Available as [programs.k3b](#opt-programs.k3b.enable).