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

Merge master into staging-next

parents e705f497 e7279da4

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 ];

    };

  };

doc/languages-frameworks/python.section.md

+2 −2
Original line number Diff line number Diff line
@@ -993,7 +993,7 @@ buildPythonPackage rec { 
  meta = {

    changelog = "https://github.com/blaze/datashape/releases/tag/${version}";

    homepage = "https://github.com/ContinuumIO/datashape";

    description = "A data description language";

    description = "Data description language";

    license = lib.licenses.bsd2;

  };

}
@@ -1118,7 +1118,7 @@ buildPythonPackage rec { 


  meta = {

    changelog = "https://github.com/pyFFTW/pyFFTW/releases/tag/v${version}";

    description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";

    description = "Pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";

    homepage = "http://hgomersall.github.com/pyFFTW";

    license = with lib.licenses; [ bsd2 bsd3 ];

  };