From 86e007bd31391c4bddf6c1610aa3fb2538896861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 20 Mar 2018 12:55:22 +0100 Subject: [PATCH] pythonPackages.klein: move expression --- .../python-modules/klein/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 ++---------------- 2 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/klein/default.nix diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix new file mode 100644 index 00000000000..f4748a93277 --- /dev/null +++ b/pkgs/development/python-modules/klein/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, werkzeug, twisted }: + +buildPythonPackage rec { + pname = "klein"; + version = "15.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hl2psnn1chm698rimyn9dgcpl1mxgc8dj11b3ipp8z37yfjs3z9"; + }; + + disabled = isPy3k; + + propagatedBuildInputs = [ werkzeug twisted ]; + + meta = with lib; { + description = "Klein Web Micro-Framework"; + homepage = "https://github.com/twisted/klein"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81740f34e52..246f92e8e73 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8835,24 +8835,8 @@ in { keyutils = callPackage ../development/python-modules/keyutils { }; - klein = buildPythonPackage rec { - name = "klein-15.3.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/k/klein/${name}.tar.gz"; - sha256 = "1hl2psnn1chm698rimyn9dgcpl1mxgc8dj11b3ipp8z37yfjs3z9"; - }; - - disabled = isPy3k; - - propagatedBuildInputs = with self; [ werkzeug twisted ]; - - meta = { - description = "Klein Web Micro-Framework"; - homepage = "https://github.com/twisted/klein"; - license = licenses.mit; - }; - }; - + klein = callPackage ../development/python-modules/klein { }; + koji = callPackage ../development/python-modules/koji { }; kombu = buildPythonPackage rec {