From 0088ac899c2298ac3bd31ff62bf3ec3a26462983 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 15 Oct 2018 23:47:56 -0400
Subject: [PATCH] pythonPackages.lpod: refactor move to python-modules

---
 .../python-modules/logilab_astng/default.nix  | 24 ++++++++++++++
 .../python-modules/lpod/default.nix           | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +------------
 3 files changed, 56 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/logilab_astng/default.nix
 create mode 100644 pkgs/development/python-modules/lpod/default.nix

diff --git a/pkgs/development/python-modules/logilab_astng/default.nix b/pkgs/development/python-modules/logilab_astng/default.nix
new file mode 100644
index 000000000000..53284d122287
--- /dev/null
+++ b/pkgs/development/python-modules/logilab_astng/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, logilab_common
+}:
+
+buildPythonPackage rec {
+  pname = "logilab-astng";
+  version = "0.24.3";
+
+  src = fetchurl {
+    url = "http://download.logilab.org/pub/astng/${pname}-${version}.tar.gz";
+    sha256 = "0np4wpxyha7013vkkrdy54dvnil67gzi871lg60z8lap0l5h67wn";
+  };
+
+  propagatedBuildInputs = [ logilab_common ];
+
+  meta = with stdenv.lib; {
+    homepage = https://www.logilab.org/project/logilab-astng;
+    description = "Python Abstract Syntax Tree New Generation";
+    license = licenses.lgpl2;
+  };
+
+}
diff --git a/pkgs/development/python-modules/lpod/default.nix b/pkgs/development/python-modules/lpod/default.nix
new file mode 100644
index 000000000000..dd40ac851865
--- /dev/null
+++ b/pkgs/development/python-modules/lpod/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, lxml
+, docutils
+, pillow
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  version = "1.1.7";
+  pname = "python-lpod";
+  # lpod library currently does not support Python 3.x
+  disabled = isPy3k;
+
+  propagatedBuildInputs = [ lxml docutils pillow ];
+
+  src = fetchFromGitHub {
+    owner = "lpod";
+    repo = "lpod-python";
+    rev = "dee32120ee582ff337b0c52a95a9a87cca71fd67";
+    sha256 = "1mikvzp27wxkzpr2lii4wg1hhx8h610agckqynvsrdc8v3nw9ciw";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/lpod/lpod-python/;
+    description = "Library implementing the ISO/IEC 26300 OpenDocument Format standard (ODF) ";
+    license = licenses.gpl3;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index df22958c8043..db4b43901276 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1960,28 +1960,9 @@ in {
 
   lmdb = callPackage ../development/python-modules/lmdb { };
 
-  lpod = buildPythonPackage rec {
-    version = "1.1.7";
-    name = "python-lpod-${version}";
-    # lpod library currently does not support Python 3.x
-    disabled = isPy3k;
-
-    propagatedBuildInputs = with self; [ lxml docutils pillow ];
   logilab_astng = callPackage ../development/python-modules/logilab_astng { };
 
-    src = pkgs.fetchFromGitHub {
-      owner = "lpod";
-      repo = "lpod-python";
-      rev = "dee32120ee582ff337b0c52a95a9a87cca71fd67";
-      sha256 = "1mikvzp27wxkzpr2lii4wg1hhx8h610agckqynvsrdc8v3nw9ciw";
-    };
-
-    meta = {
-      homepage = https://github.com/lpod/lpod-python/;
-      description = "Library implementing the ISO/IEC 26300 OpenDocument Format standard (ODF) ";
-      license = licenses.gpl3;
-    };
-  };
+  lpod = callPackage ../development/python-modules/lpod { };
 
   luftdaten = callPackage ../development/python-modules/luftdaten { };