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

Merge staging-next into staging

parents dfefabb7 e533bfc8

.github/CODEOWNERS

+0 −1
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ nixos/tests/lxd/ @adamcstephens 
pkgs/by-name/in/incus/                  @adamcstephens

pkgs/by-name/lx/lxc*                    @adamcstephens

pkgs/by-name/lx/lxd*                    @adamcstephens

pkgs/os-specific/linux/lxc/             @adamcstephens



# ExpidusOS, Flutter

/pkgs/development/compilers/flutter @RossComputerGuy

doc/languages-frameworks/coq.section.md

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ mkCoqDerivation { 
    [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp-bigenough ];



  meta = {

    description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials";

    description = "Coq/SSReflect Library for Monoidal Rings and Multinomials";

    license = lib.licenses.cecill-c;

  };

}

doc/languages-frameworks/javascript.section.md

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ buildNpmPackage rec { 
  NODE_OPTIONS = "--openssl-legacy-provider";



  meta = {

    description = "A modern web UI for various torrent clients with a Node.js backend and React frontend";

    description = "Modern web UI for various torrent clients with a Node.js backend and React frontend";

    homepage = "https://flood.js.org";

    license = lib.licenses.gpl3Only;

    maintainers = with lib.maintainers; [ winter ];

doc/languages-frameworks/ocaml.section.md

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ buildDunePackage rec { 


  meta = {

    homepage = "https://github.com/flowtype/ocaml-wtf8";

    description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates.";

    description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates";

    license = lib.licenses.mit;

    maintainers = [ lib.maintainers.eqyiel ];

  };

doc/languages-frameworks/perl.section.md

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ $ nix-generate-from-cpan XML::Simple 
    };

    propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ];

    meta = {

      description = "An API for simple XML files";

      description = "API for simple XML files";

      license = with lib.licenses; [ artistic1 gpl1Plus ];

    };

  };