From 77f61dd9878f26dd06fc7232d8d93b9858ded3d8 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 17 Feb 2013 23:39:00 +0100
Subject: [PATCH] add deluge torrent client and it's dependencies

---
 .../libtorrent-rasterbar/default.nix          | 14 ++-
 pkgs/lib/maintainers.nix                      |  1 +
 pkgs/top-level/python-packages.nix            | 91 +++++++++++++++++++
 3 files changed, 101 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 8916e926771c..517fbf2bd430 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib }:
+{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python }:
 
 stdenv.mkDerivation rec {
   name = "libtorrent-rasterbar-${version}";
-  version = "0.15.8";
+  version = "0.16.8";
   
   src = fetchurl {
     url = "http://libtorrent.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0767i20igrfadscw3vdyadd4qidybwx9h898rkaq95zlwhaygpzm";
+    sha256 = "01jxhyndqkc0qag22s5w0vs63hlp4rr4bca8k7fj37gky7w119c0";
   };
 
-  buildInputs = [ boost pkgconfig openssl zlib ];
+  buildInputs = [ boost pkgconfig openssl zlib python ];
 
-  configureFlags = [ "--with-boost=${boost}/include/boost" "--with-boost-libdir=${boost}/lib" ];
+  configureFlags = [ 
+    "--with-boost=${boost}/include/boost" 
+    "--with-boost-libdir=${boost}/lib" 
+    "--enable-python-binding"
+ ];
   
   meta = with stdenv.lib; {
     homepage = http://www.rasterbar.com/products/libtorrent/;
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index bff4ffa3b196..76aa2de723de 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -20,6 +20,7 @@
   garbas = "Rok Garbas <rok@garbas.si>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   guibert = "David Guibert <david.guibert@gmail.com>";
+  iElectric = "Domen Kozar <domen@dev.si>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ff075a5067ca..bf9bea000f8c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -721,6 +721,60 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  deluge = buildPythonPackage rec {
+    name = "deluge-1.3.5";
+
+    src = fetchurl {
+      url = "http://download.deluge-torrent.org/source/${name}.tar.gz";
+      md5 = "fbf52593a85bfa7c8520834fa9177fba";
+    };
+
+    # TODO: gui, procsettitle
+    buildInputs = [ pkgs.libtorrentRasterbar twisted Mako chardet pyxdg pkgs.pyopenssl ];
+    propagatedBuildInputs = [ pkgs.libtorrentRasterbar twisted Mako chardet pyxdg pkgs.pyopenssl ];
+
+    meta = {
+      homepage = http://deluge-torrent.org;
+      description = "Torrent client";
+      license = "GPLv3";
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+  pyxdg = buildPythonPackage rec {
+    name = "pyxdg-0.25";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyxdg/${name}.tar.gz";
+      md5 = "bedcdb3a0ed85986d40044c87f23477c";
+    };
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    meta = {
+      homepage = http://freedesktop.org/wiki/Software/pyxdg;
+      description = "Contains implementations of freedesktop.org standards";
+      license = "LGPLv2";
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+  chardet = buildPythonPackage rec {
+    name = "chardet-2.1.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/c/chardet/${name}.tar.gz";
+      md5 = "295367fd210d20f3febda615a88e1ef0";
+    };
+
+    meta = {
+      homepage = https://github.com/erikrose/chardet;
+      description = "Universal encoding detector";
+      license = "LGPLv2";
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
 
   django = buildPythonPackage rec {
     name = "Django-${version}";
@@ -1383,6 +1437,43 @@ pythonPackages = python.modules // rec {
     };
   };
 
+
+  Mako = buildPythonPackage rec {
+    name = "Mako-0.7.3";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/M/Mako/${name}.tar.gz";
+      md5 = "daf7cc50f997533b573f9b40193139a2";
+    };
+
+    buildInputs = [ MarkupSafe nose ];
+    propagatedBuildInputs = [ MarkupSafe ];
+
+    meta = {
+      description = "Super-fast templating language.";
+      homepage = http://www.makotemplates.org;
+      license = "MIT";
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  MarkupSafe = buildPythonPackage rec {
+    name = "MarkupSafe-0.15";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/M/MarkupSafe/${name}.tar.gz";
+      md5 = "4e7c4d965fe5e033fa2d7bb7746bb186";
+    };
+
+    meta = {
+      description = "Implements a XML/HTML/XHTML Markup safe string";
+      homepage = http://dev.pocoo.org;
+      license = "BSD";
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
   manuel = buildPythonPackage rec {
     name = "manuel-${version}";
     version = "1.6.0";