public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
  nixos/doc/manual/release-notes/rl-2105.xml
  pkgs/tools/security/sequoia/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-19 10:39:54 -07:00
parent 7000ae2b9a b73f621c25
commit c1f8a15dac
126 changed files with 2445 additions and 1530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+8 -2
View File
@@ -6694,8 +6694,8 @@ in {
pythonnet = callPackage
../development/python-modules/pythonnet {
# `mono >= 4.6` required to prevent crashes encountered with earlier versions.
mono = pkgs.mono4;
# Using `mono > 5`, tests are failing..
mono = pkgs.mono5;
};
python-nmap = callPackage ../development/python-modules/python-nmap { };
@@ -7770,6 +7770,8 @@ in {
spinners = callPackage ../development/python-modules/spinners { };
sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { };
sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { };
sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { };
@@ -7792,6 +7794,8 @@ in {
sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { };
sphinxcontrib-nwdiag = callPackage ../development/python-modules/sphinxcontrib-nwdiag { };
sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { };
sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { };
@@ -7804,6 +7808,8 @@ in {
sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml { };
sphinxcontrib-seqdiag = callPackage ../development/python-modules/sphinxcontrib-seqdiag { };
sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { };
sphinxcontrib-tikz = callPackage ../development/python-modules/sphinxcontrib-tikz {