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

2021-05-12 18:28:03 +02:00
parent 1d2db66464 aca1a33de6
commit a18880bf72
32 changed files with 216 additions and 99 deletions
@@ -5304,6 +5304,8 @@ in {

  py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { };

+  py-dmidecode = callPackage ../development/python-modules/py-dmidecode { };
+
  py-ubjson = callPackage ../development/python-modules/py-ubjson { };

  py2bit = callPackage ../development/python-modules/py2bit { };