python3Packages.cirq: 0.8.0 -> 0.8.2
This commit is contained in:
parent
17cac3b7ba
commit
331b6429d4
2 changed files with 6 additions and 16 deletions
|
@ -10,7 +10,7 @@
|
||||||
, networkx
|
, networkx
|
||||||
, numpy
|
, numpy
|
||||||
, pandas
|
, pandas
|
||||||
, pythonProtobuf # pythonPackages.protobuf
|
, protobuf
|
||||||
, requests
|
, requests
|
||||||
, scipy
|
, scipy
|
||||||
, sortedcontainers
|
, sortedcontainers
|
||||||
|
@ -28,15 +28,15 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "cirq";
|
pname = "cirq";
|
||||||
version = "0.8.0";
|
version = "0.8.2";
|
||||||
|
|
||||||
disabled = pythonOlder "3.5";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "quantumlib";
|
owner = "quantumlib";
|
||||||
repo = "cirq";
|
repo = "cirq";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "01nnv7r595sp60wvp7750lfdjwdsi4q0r4lmaj6li09zsdw0r4b3";
|
sha256 = "0xs46s19idh8smf80zhgraxwh3lphcdbljdrhxwhi5xcc41dfsmf";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -48,14 +48,6 @@ buildPythonPackage rec {
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
# Cirq locks protobuf==3.8.0, but tested working with default pythonPackages.protobuf (3.7). This avoids overrides/pythonPackages.protobuf conflicts
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace requirements.txt \
|
|
||||||
--replace "networkx~=2.4" "networkx" \
|
|
||||||
--replace "protobuf==3.8.0" "protobuf" \
|
|
||||||
--replace "freezegun~=0.3.15" "freezegun"
|
|
||||||
'';
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
freezegun
|
freezegun
|
||||||
google_api_core
|
google_api_core
|
||||||
|
@ -63,7 +55,7 @@ buildPythonPackage rec {
|
||||||
matplotlib
|
matplotlib
|
||||||
networkx
|
networkx
|
||||||
pandas
|
pandas
|
||||||
pythonProtobuf
|
protobuf
|
||||||
requests
|
requests
|
||||||
scipy
|
scipy
|
||||||
sortedcontainers
|
sortedcontainers
|
||||||
|
|
|
@ -2080,9 +2080,7 @@ in {
|
||||||
|
|
||||||
cmarkgfm = callPackage ../development/python-modules/cmarkgfm { };
|
cmarkgfm = callPackage ../development/python-modules/cmarkgfm { };
|
||||||
|
|
||||||
cirq = callPackage ../development/python-modules/cirq {
|
cirq = callPackage ../development/python-modules/cirq { };
|
||||||
pythonProtobuf = self.protobuf;
|
|
||||||
};
|
|
||||||
|
|
||||||
citeproc-py = callPackage ../development/python-modules/citeproc-py { };
|
citeproc-py = callPackage ../development/python-modules/citeproc-py { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue