From 8edd20b7ae5efe0b3af70efe2744062307834fda Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 16 Oct 2018 18:29:08 -0400
Subject: pythonPackages.mpd2: refactor move to python-modules

---
 pkgs/development/python-modules/mpd2/default.nix | 29 ++++++++++++++++++++++++
 pkgs/top-level/python-packages.nix               | 23 +------------------
 2 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/mpd2/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix
new file mode 100644
index 000000000000..3669b8dddbf8
--- /dev/null
+++ b/pkgs/development/python-modules/mpd2/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "mpd2";
+  version = "0.5.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1gfrxf71xll1w6zb69znqg5c9j0g7036fsalkvqprh2id640cl3a";
+  };
+
+  buildInputs = [ mock ];
+  patchPhase = ''
+    sed -i -e '/tests_require/d' \
+        -e 's/cmdclass.*/test_suite="mpd_test",/' setup.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Python client module for the Music Player Daemon";
+    homepage = "https://github.com/Mic92/python-mpd2";
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ rvl mic92 ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f38f36909143..0fb41fd5aea7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2826,28 +2826,7 @@ in {
 
   mpd = callPackage ../development/python-modules/mpd { };
 
-  mpd2 = buildPythonPackage rec {
-    name = "mpd2-${version}";
-    version = "0.5.5";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-mpd2/python-mpd2-${version}.tar.bz2";
-      sha256 = "1gfrxf71xll1w6zb69znqg5c9j0g7036fsalkvqprh2id640cl3a";
-    };
-
-    buildInputs = with self; [ mock ];
-    patchPhase = ''
-      sed -i -e '/tests_require/d' \
-          -e 's/cmdclass.*/test_suite="mpd_test",/' setup.py
-    '';
-
-    meta = {
-      description = "A Python client module for the Music Player Daemon";
-      homepage = "https://github.com/Mic92/python-mpd2";
-      license = licenses.lgpl3Plus;
-      maintainers = with maintainers; [ rvl mic92 ];
-    };
-  };
+  mpd2 = callPackage ../development/python-modules/mpd2 { };
 
   mpv = buildPythonPackage rec {
     name = "mpv-0.1";
-- 
cgit 1.4.1