From 3c36c02ca58efe53553efb5c6990fe472cf28d37 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 15 Oct 2018 15:34:55 -0400
Subject: [PATCH] pythonPackages.eyeD3: refactor move to python-modules

---
 .../python-modules/eyed3/default.nix          | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 35 +---------------
 2 files changed, 43 insertions(+), 34 deletions(-)
 create mode 100644 pkgs/development/python-modules/eyed3/default.nix

diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix
new file mode 100644
index 000000000000..e42d7956dd56
--- /dev/null
+++ b/pkgs/development/python-modules/eyed3/default.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, paver
+, python
+, isPyPy
+}:
+
+buildPythonPackage rec {
+  version = "0.7.8";
+  pname    = "eyeD3";
+  disabled = isPyPy;
+
+  src = fetchurl {
+    url = "http://eyed3.nicfit.net/releases/${pname}-${version}.tar.gz";
+    sha256 = "1nv7nhfn1d0qm7rgkzksbccgqisng8klf97np0nwaqwd5dbmdf86";
+  };
+
+  buildInputs = [ paver ];
+
+  postInstall = ''
+    for prog in "$out/bin/"*; do
+      wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH" \
+                          --prefix PATH : ${python}/bin
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Python module and command line program for processing ID3 tags";
+    homepage    = http://eyed3.nicfit.net/;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
+    longDescription = ''
+      eyeD3 is a Python module and command line program for processing ID3
+      tags. Information about mp3 files (i.e bit rate, sample frequency, play
+      time, etc.) is also provided. The formats supported are ID3 v1.0/v1.1
+      and v2.3/v2.4.
+    '';
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9bc8db9b8ec..345dfa6892ff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1740,40 +1740,7 @@ in {
 
   events = callPackage ../development/python-modules/events { };
 
-  eyeD3 = buildPythonPackage rec {
-    version = "0.7.8";
-    name    = "eyeD3-${version}";
-    disabled = isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "http://eyed3.nicfit.net/releases/${name}.tar.gz";
-      sha256 = "1nv7nhfn1d0qm7rgkzksbccgqisng8klf97np0nwaqwd5dbmdf86";
-    };
-
-    buildInputs = with self; [ paver ];
-
-    postInstall = ''
-      for prog in "$out/bin/"*; do
-        wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH" \
-                            --prefix PATH : ${python}/bin
-      done
-    '';
-
-    meta = {
-      description = "A Python module and command line program for processing ID3 tags";
-      homepage    = http://eyed3.nicfit.net/;
-      license     = licenses.gpl2;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
-
-      longDescription = ''
-        eyeD3 is a Python module and command line program for processing ID3
-        tags. Information about mp3 files (i.e bit rate, sample frequency, play
-        time, etc.) is also provided. The formats supported are ID3 v1.0/v1.1
-        and v2.3/v2.4.
-      '';
-    };
-  };
+  eyeD3 = callPackage ../development/python-modules/eyed3 { };
 
   execnet = buildPythonPackage rec {
     name = "${pname}-${version}";