Merge pull request #43837 from pandaman64/qiskit-0.5.7

qiskit: 0.5.4 -> qiskit 0.5.7

3 files changed, 6 insertions, 31 deletions

diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix
index 174e0871ca2f..5f7cded86fda 100644
--- a/pkgs/development/python-modules/qasm2image/default.nix
+++ b/pkgs/development/python-modules/qasm2image/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "qasm2image";
-  version = "0.5.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "nelimeee";
     repo = "qasm2image";
-    rev = "7f3c3e4d1701b8b284ef0352aa3a47722ebbbcaa";
-    sha256 = "129xlpwp36h2czzw1wcl8df2864zg3if2gaad1v18ah1cf68b0f3";
+    rev = "57a640621bbbc74244f07e2e068a26411b0d9b24";
+    sha256 = "1ha5vfl4jfwcwbipsq07xlknkrvx79z5bwbzndybclyk9pa69dlz";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
index 1eda590a864f..4ca0155627ce 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -21,13 +21,13 @@
 
 buildPythonPackage rec {
   pname = "qiskit";
-  version = "0.5.4";
+  version = "0.5.7";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a86014da4ea8fe057ad3b953b44e2342f2bae3e1f9ac0d5f5d51dd659c33accf";
+    sha256 = "a5a2c6c074f8479dc83d1d599dfebf2363402a182835b8fa5742804055148b17";
   };
 
   buildInputs = [ cmake ]
@@ -50,13 +50,9 @@ buildPythonPackage rec {
   # Pypi's tarball doesn't contain tests
   doCheck = false;
 
-  patches = [
-    ./setup.py.patch
-  ];
-
   meta = {
     description = "Quantum Software Development Kit for writing quantum computing experiments, programs, and applications";
-    homepage    = https://github.com/QISKit/qiskit-sdk-py;
+    homepage    = https://github.com/QISKit/qiskit-terra;
     license     = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [
       pandaman
diff --git a/pkgs/development/python-modules/qiskit/setup.py.patch b/pkgs/development/python-modules/qiskit/setup.py.patch
deleted file mode 100644
index 9c4224ce64c6..000000000000
--- a/pkgs/development/python-modules/qiskit/setup.py.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -18,13 +18,13 @@ from setuptools.dist import Distribution
- 
- requirements = [
-     "IBMQuantumExperience>=1.9.2",
--    "matplotlib>=2.1,<2.2",
--    "networkx>=2.0,<2.1",
--    "numpy>=1.13,<1.15",
--    "ply==3.10",
--    "scipy>=0.19,<1.2",
--    "sympy>=1.0,<1.2",
--    "pillow>=4.2.1,<5.2"
-+    "matplotlib>=2.1",
-+    "networkx>=2.0",
-+    "numpy>=1.13",
-+    "ply>=3.10",
-+    "scipy>=0.19",
-+    "sympy>=1.0",
-+    "pillow>=4.2.1"
- ]