From 1e454c5045b325948a215cae6d8c25eb853c5ed5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 17 Jul 2018 23:05:55 +0200 Subject: pythonPackages.graphite_api: move expression According to the current convention python packages should live in `pkgs/development/python-modules`. As I altered the `graphite_api` expression previously in d3d1b888737 I decided to move it as well. Additionally I applied some minor refactorings: * use `fetchFromGitHub` instead of `fetchgit`. * use `checkInputs` for test dependencies * got rid of fixed points * applied patch which supports flask-caching to 1.3.1 using `git apply -3` --- pkgs/top-level/python-packages.nix | 39 +------------------------------------- 1 file changed, 1 insertion(+), 38 deletions(-) (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ea8348314b5..07cf9e5623a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15821,44 +15821,7 @@ EOF }; }; - graphite_api = buildPythonPackage rec { - name = "graphite-api-1.0.1"; - disabled = isPyPy; - - src = pkgs.fetchgit { - url = "https://github.com/brutasse/graphite-api.git"; - rev = "b6f75e8a08fae695c094fece6de611b893fc65fb"; - sha256 = "1n8h5krhv7hzmn336y9vjrmv6b6009lz5hj0d9wz7v1k2500ws5k"; - }; - - checkPhase = "nosetests"; - - propagatedBuildInputs = with self; [ - flask - flask-caching - cairocffi - pyparsing - pytz - pyyaml - raven - six - structlog - tzlocal - ]; - - buildInputs = with self; [ - nose - mock - ]; - - LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib"; - - meta = { - description = "Graphite-web, without the interface. Just the rendering HTTP API"; - homepage = https://github.com/brutasse/graphite-api; - license = licenses.asl20; - }; - }; + graphite_api = callPackage ../development/python-modules/graphite-api { }; graphite_beacon = buildPythonPackage rec { name = "graphite_beacon-0.27.0"; -- cgit 1.4.1