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

Conflicts: pkgs/development/python-modules/pyvex/default.nix pkgs/top-level/python-packages.nix
2021-04-23 13:49:12 +00:00
parent ca65d6f7d2 638936f657
commit 4f4d95bbc2
37 changed files with 1245 additions and 1658 deletions
@@ -4568,6 +4568,8 @@ in {
    pythonPackages = self;
  });

+  openerz-api = callPackage ../development/python-modules/openerz-api { };
+
  openhomedevice = callPackage ../development/python-modules/openhomedevice { };

  openidc-client = callPackage ../development/python-modules/openidc-client { };