From 191d2e4be6ce0f6550528b62d6470ca60dac4b66 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 30 Apr 2012 13:30:47 +0000
Subject: [PATCH] Adding i3wm, file 5.11, python packages. Patch by garbas.

svn path=/nixpkgs/trunk/; revision=33949
---
 pkgs/top-level/all-packages.nix    |  11 +++
 pkgs/top-level/python-packages.nix | 146 ++++++++++++++++++++++++++++-
 2 files changed, 153 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71f3949d3c85..7a55555fc200 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -674,6 +674,7 @@ let
   figlet = callPackage ../tools/misc/figlet { };
 
   file = callPackage ../tools/misc/file { };
+  file511 = callPackage ../tools/misc/file/511.nix { };
 
   fileschanged = callPackage ../tools/misc/fileschanged { };
 
@@ -6943,6 +6944,14 @@ let
 
   hydrogen = callPackage ../applications/audio/hydrogen { };
 
+  i3 = callPackage ../applications/window-managers/i3 { };
+
+  i3lock = callPackage ../applications/window-managers/i3/lock.nix {
+    cairo = cairo.override { xcbSupport = true; };
+  };
+
+  i3status = callPackage ../applications/window-managers/i3/status.nix { };
+
   i810switch = callPackage ../os-specific/linux/i810switch { };
 
   icecat3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 {
@@ -8428,6 +8437,8 @@ let
 
   darcnes = callPackage ../misc/emulators/darcnes { };
 
+  dbacl = callPackage ../tools/misc/dbacl { };
+
   dblatex = callPackage ../tools/typesetting/tex/dblatex { };
 
   dosbox = callPackage ../misc/emulators/dosbox { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3c9f6bef92ee..f0d297b8837b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32,6 +32,60 @@ let pythonPackages = python.modules // rec {
     ../development/python-modules/generic/wrap.sh;
 
 
+  afew = buildPythonPackage rec {
+    rev = "a3ea63d7048faedb6cc58b4abcb6d4ecfddfb5db";
+    name = "afew-1.0pre${rev}";
+    src = fetchurl {
+      url = "https://github.com/teythoon/afew/tarball/${rev}";
+      name = "${name}.tar.bz";
+      sha256 = "4e8850242a3845602331cabb47299b5a3af21993036a715c83e8dd698ab5d716";
+    };
+
+    propagatedBuildInputs = [ notmuch pkgs.dbacl ];
+
+    doCheck = false;
+
+    postInstall = ''
+      wrapProgram $out/bin/afew \
+        --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib
+    '';
+
+    meta = {
+      homepage = https://github.com/teythoon/afew;
+      description = "afew is an initial tagging script for notmuch mail.";
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = python.meta.platforms;
+    };
+  };
+
+
+  alot = buildPythonPackage rec {
+    name = "alot-0.3";
+
+    src = fetchurl {
+      url = "https://github.com/pazz/alot/tarball/0.3";
+      name = "${name}.tar.bz";
+      md5 = "fa4944a1a7e9e380da0ee75ea3571a79";
+    };
+
+    doCheck = false;
+
+    propagatedBuildInputs = [ notmuch urwid twisted magic configobj ];
+
+    postInstall = ''
+      wrapProgram $out/bin/alot \
+        --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file511}/lib
+    '';
+
+    meta = {
+      homepage = https://github.com/pazz/alot;
+      description = "Terminal MUA using notmuch mail";
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = python.meta.platforms;
+    };
+  };
+
+
   anyjson = buildPythonPackage rec {
     name = "anyjson-0.3.1";
 
@@ -292,6 +346,25 @@ let pythonPackages = python.modules // rec {
     };
   });
 
+  configobj = buildPythonPackage (rec {
+    name = "configobj-4.7.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/c/configobj/${name}.tar.gz";
+      md5 = "201dbaa732a9049c839f9bb6c27fc7b5";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "Config file reading, writing and validation.";
+      homepage = http://pypi.python.org/pypi/configobj;
+      license = pkgs.licenses.bsd3;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = python.meta.platforms;
+    };
+  });
+
   cssutils = buildPythonPackage (rec {
     name = "cssutils-0.9.7a6";
 
@@ -773,17 +846,20 @@ let pythonPackages = python.modules // rec {
 
 
   magic = pkgs.stdenv.mkDerivation rec {
-    name = "python-${pkgs.file.name}";
+    name = "python-${pkgs.file511.name}";
 
-    src = pkgs.file.src;
+    src = pkgs.file511.src;
 
-    buildInputs = [ python pkgs.file ];
+    patches = [ ../tools/misc/file/python.patch ];
+    buildInputs = [ python pkgs.file511 ];
 
     configurePhase = "cd python";
 
     buildPhase = "python setup.py build";
 
-    installPhase = "python setup.py install --prefix=$out";
+    installPhase = ''
+      python setup.py install --prefix=$out
+    '';
 
     meta = {
       description = "A Python wrapper around libmagic";
@@ -1073,6 +1149,28 @@ let pythonPackages = python.modules // rec {
     };
   });
 
+  notmuch = pkgs.stdenv.mkDerivation rec {
+    name = "python-${pkgs.notmuch.name}";
+
+    src = pkgs.notmuch.src;
+
+    buildInputs = [ python pkgs.notmuch ];
+    #propagatedBuildInputs = [ python pkgs.notmuch ];
+
+    configurePhase = "cd bindings/python";
+
+    buildPhase = "python setup.py build";
+
+    installPhase = "python setup.py install --prefix=$out";
+
+    meta = {
+      description = "A Python wrapper around notmuch";
+      homepage = http://notmuchmail.org/;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = python.meta.platforms;
+    };
+  };
+
   numpy = buildPythonPackage ( rec {
     name = "numpy-1.6.1";
 
@@ -1311,6 +1409,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
+
   pyasn1 = buildPythonPackage ({
     name = "pyasn1-0.0.11a";
 
@@ -1330,6 +1429,26 @@ let pythonPackages = python.modules // rec {
     };
   });
 
+  Babel = buildPythonPackage (rec {
+    name = "Babel-0.9.6";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/B/Babel/${name}.tar.gz";
+      sha256 = "4a3a085ecf1fcd2736573538ffa114f1f4331b3bbbdd69381e6e172c49c9750f";
+    };
+
+    doCheck = false;
+
+    meta = {
+      homepage = http://babel.edgewall.org;
+      description = "A collection of tools for internationalizing Python applications.";
+      license = "BSD";
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = stdenv.lib.platforms.linux;
+    };
+  });
+
+
   pycryptopp = buildPythonPackage (rec {
     name = "pycryptopp-0.5.29";
 
@@ -2131,6 +2250,25 @@ let pythonPackages = python.modules // rec {
     };
   };
 
+  urwid = buildPythonPackage (rec {
+    name = "urwid-1.0.1";
+
+    doCheck = false;
+
+    src = fetchurl {
+      url = "http://excess.org/urwid/${name}.tar.gz";
+      md5 = "828f7144b94920205e755c249d2e297f";
+    };
+
+    meta = {
+      description = "A full-featured console (xterm et al.) user interface library";
+      homepage = http://excess.org/urwid;
+      license = pkgs.licenses.lgpl21;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = python.meta.platforms;
+    };
+  });
+
   virtualenv = buildPythonPackage rec {
     name = "virtualenv-1.6.4";
     src = fetchurl {