Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-02-14 06:16:29 +00:00
committed by GitHub
27 changed files with 429 additions and 147 deletions

View File

@@ -546,6 +546,8 @@ in {
augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; };
auroranoaa = callPackage ../development/python-modules/auroranoaa { };
auth0-python = callPackage ../development/python-modules/auth0-python { };
authheaders = callPackage ../development/python-modules/authheaders { };
@@ -2858,6 +2860,8 @@ in {
else
callPackage ../development/python-modules/gunicorn { };
guppy3 = callPackage ../development/python-modules/guppy3 { };
gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" then
callPackage ../development/python-modules/gurobipy/darwin.nix { inherit (pkgs.darwin) cctools insert_dylib; }
else if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -4036,6 +4040,8 @@ in {
metaphone = callPackage ../development/python-modules/metaphone { };
metar = callPackage ../development/python-modules/metar { };
mezzanine = callPackage ../development/python-modules/mezzanine { };
micawber = callPackage ../development/python-modules/micawber { };
@@ -4921,6 +4927,8 @@ in {
pynuki = callPackage ../development/python-modules/pynuki { };
pynws = callPackage ../development/python-modules/pynws { };
pysbd = callPackage ../development/python-modules/pysbd { };
pyshark = callPackage ../development/python-modules/pyshark { };