From 7e8a4f67fefadd5598cc37d0d08dba1c1a336a99 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:56:42 -0400 Subject: [PATCH] pythonPackages.lektor: refactor move to python-modules --- .../python-modules/lektor/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 29 +----------- 2 files changed, 47 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/lektor/default.nix diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix new file mode 100644 index 00000000000..6eb84043d78 --- /dev/null +++ b/pkgs/development/python-modules/lektor/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, buildPythonPackage +, fetchgit +, click +, watchdog +, exifread +, requests +, mistune +, inifile +, Babel +, jinja2 +, flask +, pyopenssl +, ndg-httpsclient +, pkgs +}: + +buildPythonPackage rec { + pname = "lektor"; + version = "2.3"; + + src = fetchgit { + url = "https://github.com/lektor/lektor"; + rev = "refs/tags/${version}"; + sha256 = "1n0ylh1sbpvi9li3g6a7j7m28njfibn10y6s2gayjxwm6fpphqxy"; + }; + + buildInputs = [ pkgs.glibcLocales ]; + propagatedBuildInputs = [ + click watchdog exifread requests mistune inifile Babel jinja2 + flask pyopenssl ndg-httpsclient + ]; + + LC_ALL="en_US.UTF-8"; + + # No tests included in archive + doCheck = false; + + meta = with stdenv.lib; { + description = "A static content management system"; + homepage = "https://www.getlektor.com/"; + license = licenses.bsd0; + maintainers = with maintainers; [ vozz ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0240dfe27cd..2ce4f5cb984 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5680,34 +5680,7 @@ in { le = callPackage ../development/python-modules/le { }; - lektor = buildPythonPackage rec { - name = "lektor-${version}"; - - version = "2.3"; - - src = pkgs.fetchgit { - url = "https://github.com/lektor/lektor"; - rev = "refs/tags/${version}"; - sha256 = "1n0ylh1sbpvi9li3g6a7j7m28njfibn10y6s2gayjxwm6fpphqxy"; - }; - - LC_ALL="en_US.UTF-8"; - - meta = { - description = "A static content management system"; - homepage = "https://www.getlektor.com/"; - license = "BSD"; - maintainers = with maintainers; [ vozz ]; - }; - - # No tests included in archive - doCheck = false; - - propagatedBuildInputs = with self; [ - click watchdog exifread requests mistune inifile Babel jinja2 - flask pyopenssl ndg-httpsclient pkgs.glibcLocales - ]; - }; + lektor = callPackage ../development/python-modules/lektor { }; python-oauth2 = callPackage ../development/python-modules/python-oauth2 { };