Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-04-03 21:54:40 +02:00
357 changed files with 6567 additions and 4186 deletions
+4
View File
@@ -1649,6 +1649,8 @@ in {
alabaster = callPackage ../development/python-modules/alabaster {};
alarmdecoder = callPackage ../development/python-modules/alarmdecoder {};
alembic = callPackage ../development/python-modules/alembic {};
allpairspy = callPackage ../development/python-modules/allpairspy { };
@@ -7136,6 +7138,8 @@ in {
qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { };
qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { };
qiskit-terra = callPackage ../development/python-modules/qiskit-terra { };
qasm2image = callPackage ../development/python-modules/qasm2image { };