From a6e601869460d282d588963ecf3e14cf71d4cf48 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:52:40 -0400 Subject: [PATCH] pythonPackages.le: refactor move to python-modules --- .../development/python-modules/le/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------ 2 files changed, 31 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/le/default.nix diff --git a/pkgs/development/python-modules/le/default.nix b/pkgs/development/python-modules/le/default.nix new file mode 100644 index 000000000000..cb0a8bc63481 --- /dev/null +++ b/pkgs/development/python-modules/le/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, isPy3k +, simplejson +, psutil +}: + +buildPythonPackage rec { + pname = "le"; + version = "1.4.29"; + + src = fetchurl { + url = "https://github.com/logentries/le/archive/v${version}.tar.gz"; + sha256 = "d29738937cb6e714b6ec2ae74b66b1983482ffd54b4faa40767af18509521d4c"; + }; + + disabled = isPy3k; + + doCheck = false; + + propagatedBuildInputs = [ simplejson psutil ]; + + meta = with stdenv.lib; { + homepage = https://github.com/rapid7/le; + description = "Logentries agent"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d416e74f348..0240dfe27cd4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5678,26 +5678,7 @@ in { ldaptor = callPackage ../development/python-modules/ldaptor { }; - le = buildPythonPackage rec { - name = "le-${version}"; - version = "1.4.29"; - - src = pkgs.fetchurl { - url = "https://github.com/logentries/le/archive/v${version}.tar.gz"; - sha256 = "d29738937cb6e714b6ec2ae74b66b1983482ffd54b4faa40767af18509521d4c"; - }; - - disabled = isPy3k; - - doCheck = false; - - propagatedBuildInputs = with self; [ simplejson psutil ]; - - meta = { - homepage = "https://github.com/logentries/le"; - description = "Logentries agent"; - }; - }; + le = callPackage ../development/python-modules/le { }; lektor = buildPythonPackage rec { name = "lektor-${version}";