From 809b3803b94c81a73a694fe2e703dccfb8de8559 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 16 Jun 2015 19:38:03 +0200
Subject: [PATCH] pythonIRClib: reimplement using buildPythonPackage

---
 .../python-modules/irclib/default.nix         | 23 ++++++-------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/irclib/default.nix b/pkgs/development/python-modules/irclib/default.nix
index 4fdf93e126b6..38ae5949229f 100644
--- a/pkgs/development/python-modules/irclib/default.nix
+++ b/pkgs/development/python-modules/irclib/default.nix
@@ -1,31 +1,22 @@
-a @ {python, ...} :
-let
-  fetchurl = a.fetchurl;
+{ buildPythonPackage, fetchurl }:
+
+buildPythonPackage rec {
+  name = "irclib-${version}";
+  version = "0.4.8";
 
-  version = a.lib.attrByPath ["version"] "0.4.8" a;
-  buildInputs = with a; [
-    python
-  ];
-in
-rec {
   src = fetchurl {
     url = "mirror://sourceforge/python-irclib/python-irclib-${version}.tar.gz";
     sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1";
   };
+
   patches = [(fetchurl {
     url = "http://trac.uwc.ac.za/trac/python_tools/browser/xmpp/resources/irc-transport/irclib.py.diff?rev=387&format=raw";
     name = "irclib.py.diff";
     sha256 = "5fb8d95d6c95c93eaa400b38447c63e7a176b9502bc49b2f9b788c9905f4ec5e";
   })];
+
   patchFlags = "irclib.py";
 
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doPatch" "installPythonPackage"];
-
-  name = "python-irclib-" + version;
   meta = {
     description = "Python IRC library";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9dedd8c3bd5e..14342fb762ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2780,7 +2780,7 @@ let
 
   pythonDBus = dbus_python;
 
-  pythonIRClib = builderDefsPackage (callPackage ../development/python-modules/irclib) { };
+  pythonIRClib = callPackage ../development/python-modules/irclib { };
 
   pythonSexy = builderDefsPackage (callPackage ../development/python-modules/libsexy) { };