From 08b3dbea20b318cf40ffdd2b7059201d8e6d4d98 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 15:00:59 -0400 Subject: [PATCH] pythonPackages.warlock: refactor move to python-modules --- .../python-modules/warlock/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/warlock/default.nix diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix new file mode 100644 index 000000000000..0f75be8be177 --- /dev/null +++ b/pkgs/development/python-modules/warlock/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, jsonpatch +, jsonschema +, jsonpointer +}: + +buildPythonPackage rec { + pname = "warlock"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0npgi4ks0nww2d6ci791iayab0j6kz6dx3jr7bhpgkql3s4if3bw"; + }; + + propagatedBuildInputs = [ six jsonpatch jsonschema jsonpointer ]; + + meta = with stdenv.lib; { + homepage = https://github.com/bcwaldon/warlock; + description = "Python object model built on JSON schema and JSON patch"; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c0877779df5..5af934e335a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3019,27 +3019,7 @@ in { cmd2_9 = callPackage ../development/python-modules/cmd2 {}; cmd2 = if isPy27 then self.cmd2_8 else self.cmd2_9; - warlock = buildPythonPackage rec { - name = "warlock-${version}"; - version = "1.2.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/warlock/${name}.tar.gz"; - sha256 = "0npgi4ks0nww2d6ci791iayab0j6kz6dx3jr7bhpgkql3s4if3bw"; - }; - - propagatedBuildInputs = with self; [ - six jsonpatch jsonschema jsonpointer - ]; - buildInputs = with self; [ - - ]; - - meta = with stdenv.lib; { - homepage = https://github.com/bcwaldon/warlock; - }; - }; - + warlock = callPackage ../development/python-modules/warlock { }; pecan = callPackage ../development/python-modules/pecan { };