From d430e7ece13564115c4cd56ff61831cfc9610d39 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:33:23 -0400 Subject: [PATCH] pythonPackages.pythonIRClib: refactor move to python-modules --- .../python-modules/pythonirclib/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +-------------- 2 files changed, 35 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/pythonirclib/default.nix diff --git a/pkgs/development/python-modules/pythonirclib/default.nix b/pkgs/development/python-modules/pythonirclib/default.nix new file mode 100644 index 000000000000..35873d301be4 --- /dev/null +++ b/pkgs/development/python-modules/pythonirclib/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, paver +, isPy3k +}: + +buildPythonPackage rec { + pname = "irclib"; + version = "0.4.8"; + disabled = isPy3k; + + 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"; + + propagatedBuildInputs = [ paver ]; + + meta = with stdenv.lib; { + description = "Python IRC library"; + homepage = https://bitbucket.org/jaraco/irc; + license = with licenses; [ lgpl21 ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bda9da7b9fa5..9a5b151ac228 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5595,32 +5595,7 @@ in { ipdbplugin = callPackage ../development/python-modules/ipdbplugin { }; - pythonIRClib = buildPythonPackage rec { - name = "irclib-${version}"; - version = "0.4.8"; - - src = pkgs.fetchurl { - url = "mirror://sourceforge/python-irclib/python-irclib-${version}.tar.gz"; - sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1"; - }; - - patches = [(pkgs.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"; - - propagatedBuildInputs = with self; [ paver ]; - - disabled = isPy3k; - meta = { - description = "Python IRC library"; - homepage = https://bitbucket.org/jaraco/irc; - license = with licenses; [ lgpl21 ]; - }; - }; + pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; iso-639 = callPackage ../development/python-modules/iso-639 {};