Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-01-10 10:34:04 +01:00
141 changed files with 1935 additions and 876 deletions
+20
View File
@@ -548,6 +548,8 @@ in {
connexion = callPackage ../development/python-modules/connexion { };
coordinates = callPackage ../development/python-modules/coordinates { };
cozy = callPackage ../development/python-modules/cozy { };
codespell = callPackage ../development/python-modules/codespell { };
@@ -759,6 +761,8 @@ in {
i3ipc = callPackage ../development/python-modules/i3ipc { };
ihatemoney = callPackage ../development/python-modules/ihatemoney { };
imutils = callPackage ../development/python-modules/imutils { };
inotify-simple = callPackage ../development/python-modules/inotify-simple { };
@@ -1022,6 +1026,8 @@ in {
PyChromecast = callPackage ../development/python-modules/pychromecast { };
pycm = callPackage ../development/python-modules/pycm { };
py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { };
py-lru-cache = callPackage ../development/python-modules/py-lru-cache { };
@@ -1800,6 +1806,8 @@ in {
colour = callPackage ../development/python-modules/colour {};
colormath = callPackage ../development/python-modules/colormath {};
configshell = callPackage ../development/python-modules/configshell { };
consonance = callPackage ../development/python-modules/consonance { };
@@ -1852,6 +1860,8 @@ in {
defusedxml = callPackage ../development/python-modules/defusedxml {};
dodgy = callPackage ../development/python-modules/dodgy { };
dugong = callPackage ../development/python-modules/dugong {};
easysnmp = callPackage ../development/python-modules/easysnmp {
@@ -3727,6 +3737,8 @@ in {
hvac = callPackage ../development/python-modules/hvac { };
hydra = callPackage ../development/python-modules/hydra { };
hypothesis = callPackage ../development/python-modules/hypothesis { };
colored = callPackage ../development/python-modules/colored { };
@@ -3986,6 +3998,8 @@ in {
python_magic = callPackage ../development/python-modules/python-magic { };
m3u8 = callPackage ../development/python-modules/m3u8 { };
magic = callPackage ../development/python-modules/magic { };
m2crypto = callPackage ../development/python-modules/m2crypto { };
@@ -4390,6 +4404,8 @@ in {
od = callPackage ../development/python-modules/od { };
omegaconf = callPackage ../development/python-modules/omegaconf { };
orderedset = callPackage ../development/python-modules/orderedset { };
python-multipart = callPackage ../development/python-modules/python-multipart { };
@@ -4803,6 +4819,8 @@ in {
pylint = if isPy3k then callPackage ../development/python-modules/pylint { }
else callPackage ../development/python-modules/pylint/1.9.nix { };
pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { };
pyomo = callPackage ../development/python-modules/pyomo { };
pyopencl = callPackage ../development/python-modules/pyopencl { };
@@ -5125,6 +5143,8 @@ in {
repocheck = callPackage ../development/python-modules/repocheck { };
restrictedpython = callPackage ../development/python-modules/restrictedpython { };
restview = callPackage ../development/python-modules/restview { };
readme = callPackage ../development/python-modules/readme { };