From d6a6ce61ae399660718ef544f75043ba5311a34f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:44:52 +0100 Subject: [PATCH] python.pkgs.Mako: move expression --- .../python-modules/Mako/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------ 2 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/Mako/default.nix diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix new file mode 100644 index 000000000000..e9e3bbb6d498 --- /dev/null +++ b/pkgs/development/python-modules/Mako/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, markupsafe +, nose +, mock +, pytest +, isPyPy +}: + +buildPythonPackage rec { + pname = "Mako"; + version = "1.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nchpw6akfcsg8w6irjlx0gyzadc123hv4g47sijgnqd9nz9vngy"; + }; + + checkInputs = [ markupsafe nose mock pytest ]; + propagatedBuildInputs = [ markupsafe ]; + + doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 + + meta = { + description = "Super-fast templating language"; + homepage = http://www.makotemplates.org; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ domenkozar ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 248a739bc014..17bfb85d7da3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10339,28 +10339,7 @@ in { }; }; - - Mako = buildPythonPackage rec { - name = "Mako-1.0.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/M/Mako/${name}.tar.gz"; - sha256 = "0nchpw6akfcsg8w6irjlx0gyzadc123hv4g47sijgnqd9nz9vngy"; - }; - - buildInputs = with self; [ markupsafe nose mock pytest ]; - propagatedBuildInputs = with self; [ markupsafe ]; - - doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 - - meta = { - description = "Super-fast templating language"; - homepage = http://www.makotemplates.org; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ domenkozar ]; - }; - }; + Mako = callPackage ../development/python-modules/Mako { }; manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {}; marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {};