From 64d22bc0a9278227a64d070111ed66c4471a002f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:05:02 -0400 Subject: [PATCH] pythonPackages.pillowfight: refactor move to python-modules --- .../python-modules/pillowfight/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------- 2 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/pillowfight/default.nix diff --git a/pkgs/development/python-modules/pillowfight/default.nix b/pkgs/development/python-modules/pillowfight/default.nix new file mode 100644 index 000000000000..e32051bc26f9 --- /dev/null +++ b/pkgs/development/python-modules/pillowfight/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pillow +}: + +buildPythonPackage rec { + pname = "pillowfight"; + version = "0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mh1nhcjjgv7x134sv0krri59ng8bp2w6cwsxc698rixba9f3g0m"; + }; + + propagatedBuildInputs = [ pillow ]; + + meta = with stdenv.lib; { + description = "Pillow Fight"; + homepage = "https://github.com/beanbaginc/pillowfight"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d37e86f2ae0..ee1cf9b69118 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2322,23 +2322,7 @@ in { djmail = callPackage ../development/python-modules/djmail { }; - pillowfight = buildPythonPackage rec { - name = "pillowfight-${version}"; - version = "0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pillowfight/pillowfight-${version}.tar.gz"; - sha256 = "1mh1nhcjjgv7x134sv0krri59ng8bp2w6cwsxc698rixba9f3g0m"; - }; - - propagatedBuildInputs = with self; [ - pillow - ]; - meta = with stdenv.lib; { - description = "Pillow Fight"; - homepage = "https://github.com/beanbaginc/pillowfight"; - }; - }; + pillowfight = callPackage ../development/python-modules/pillowfight { }; kaptan = buildPythonPackage rec { name = "kaptan-${version}";