From 6d367ba9f346016c3f435e4caaa8ab3d88625054 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Wed, 13 Sep 2017 22:37:57 -0400 Subject: [PATCH] eve: 0.6.1 -> 0.7.4 --- .../python-modules/eve/default.nix | 39 +++++++++++++++++++ .../python-modules/eve/setup.patch | 21 ++++++++++ pkgs/top-level/python-packages.nix | 33 +--------------- 3 files changed, 61 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/eve/default.nix create mode 100644 pkgs/development/python-modules/eve/setup.patch diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix new file mode 100644 index 00000000000..1a9b684a9f3 --- /dev/null +++ b/pkgs/development/python-modules/eve/default.nix @@ -0,0 +1,39 @@ +{ stdenv, buildPythonPackage, fetchPypi, flask, jinja2, itsdangerous, events +, markupsafe, pymongo, flask-pymongo, werkzeug, simplejson, cerberus }: + +buildPythonPackage rec { + pname = "Eve"; + version = "0.7.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xihl5w2m4vkp0515qjibiy88pk380n5jmj8n9hh7q40b1vx1kwb"; + }; + + patches = [ + ./setup.patch + ]; + + propagatedBuildInputs = [ + cerberus + events + flask-pymongo + flask + itsdangerous + jinja2 + markupsafe + pymongo + simplejson + werkzeug + ]; + + # tests call a running mongodb instance + doCheck = false; + + meta = with stdenv.lib; { + homepage = "http://python-eve.org/"; + description = "Open source Python REST API framework designed for human beings"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/eve/setup.patch b/pkgs/development/python-modules/eve/setup.patch new file mode 100644 index 00000000000..8e5ca27757e --- /dev/null +++ b/pkgs/development/python-modules/eve/setup.patch @@ -0,0 +1,21 @@ +diff --git i/setup.py w/setup.py +index 0176467..2b74988 100755 +--- i/setup.py ++++ w/setup.py +@@ -9,11 +9,11 @@ install_requires = [ + 'cerberus>=0.9.2,<0.10', + 'events>=0.2.1,<0.3', + 'simplejson>=3.3.0,<4.0', +- 'werkzeug>=0.9.4,<=0.11.15', +- 'markupsafe>=0.23,<1.0', +- 'jinja2>=2.8,<3.0', +- 'itsdangerous>=0.24,<1.0', +- 'flask>=0.10.1,<=0.12', ++ 'werkzeug>=0.9.4', ++ 'markupsafe>=0.23', ++ 'jinja2>=2.8', ++ 'itsdangerous>=0.24', ++ 'flask>=0.10.1', + 'pymongo>=3.4', + 'flask-pymongo>=0.4', + ] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index baac6bf2605..cb6fa442662 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5266,38 +5266,7 @@ in { }; }; - eve = buildPythonPackage rec { - version = "0.6.1"; - name = "Eve-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/E/Eve/${name}.tar.gz"; - sha256 = "0wf1x8qixkld6liz5syqi8i9nrfrhq4lpmh0p9cy3jbkhk34km69"; - }; - - propagatedBuildInputs = with self; [ - cerberus - events - flask-pymongo - flask - itsdangerous - jinja2 - markupsafe - pymongo_2_9_1 - simplejson - werkzeug - ]; - - # tests call a running mongodb instance - doCheck = false; - - meta = { - homepage = "http://python-eve.org/"; - description = "Open source Python REST API framework designed for human beings"; - license = licenses.bsd3; - }; - }; - + eve = callPackage ../development/python-modules/eve {}; eventlib = buildPythonPackage rec { pname = "python-eventlib";