Skip to content

Commit

Permalink
whisper: upgrade to the same version as the other graphite components
Browse files Browse the repository at this point in the history
Without this we get the following Python exception when trying to fetch
a graph in the graphite web app:

    File "/nix/store/nj62jqk2xmp5c3h93pfnlqn66qj1kkvs-python-2.7.12-env/lib/python2.7/site-packages/opt/graphite/webapp/graphite/storage.py", line 335, in fetch
      return whisper.fetch(self.fs_path, startTime, endTime, now)
  TypeError: fetch() takes at most 3 arguments (4 given)

Fixes #21032.
  • Loading branch information
basvandijk authored and fpletz committed Dec 15, 2016
1 parent 6fc5f8d commit b4005bb
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ let

buildPythonApplication = args: buildPythonPackage ({namePrefix="";} // args );

graphiteVersion = "0.9.15";

in {

inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication;
Expand Down Expand Up @@ -27764,11 +27766,11 @@ in {

whisper = buildPythonPackage rec {
name = "whisper-${version}";
version = "0.9.12";
version = graphiteVersion;

src = pkgs.fetchurl {
url = "mirror://pypi/w/whisper/${name}.tar.gz";
sha256 = "0eca66449d6ceb29e2ab5457b01618e0fe525710dd130a286a18282d849ae5b2";
sha256 = "1chkphxwnwvy2cs7jc2h2i0lqqvi9jx6vqj3ly88lwk7m35r4ss2";
};

# error: invalid command 'test'
Expand All @@ -27783,7 +27785,7 @@ in {

carbon = buildPythonPackage rec {
name = "carbon-${version}";
version = "0.9.15";
version = graphiteVersion;

src = pkgs.fetchurl {
url = "mirror://pypi/c/carbon/${name}.tar.gz";
Expand Down Expand Up @@ -28016,7 +28018,7 @@ in {
graphite_web = buildPythonPackage rec {
name = "graphite-web-${version}";
disabled = isPy3k;
version = "0.9.15";
version = graphiteVersion;

src = pkgs.fetchurl rec {
url = "mirror://pypi/g/graphite-web/${name}.tar.gz";
Expand Down

0 comments on commit b4005bb

Please sign in to comment.