From 0362f55a222a1b857451b29da2c63bdc6cbdba5a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 30 Apr 2012 13:45:50 +0000
Subject: [PATCH] add missing files from previous commit

svn path=/nixpkgs/trunk/; revision=33950
---
 .../window-managers/i3/default.nix            |  64 ++++++++
 pkgs/applications/window-managers/i3/lock.nix | 150 ++++++++++++++++++
 .../window-managers/i3/status.nix             | 144 +++++++++++++++++
 pkgs/tools/misc/dbacl/default.nix             | 112 +++++++++++++
 pkgs/tools/misc/file/511.nix                  |  17 ++
 pkgs/tools/misc/file/python.patch             |  11 ++
 6 files changed, 498 insertions(+)
 create mode 100644 pkgs/applications/window-managers/i3/default.nix
 create mode 100644 pkgs/applications/window-managers/i3/lock.nix
 create mode 100644 pkgs/applications/window-managers/i3/status.nix
 create mode 100644 pkgs/tools/misc/dbacl/default.nix
 create mode 100644 pkgs/tools/misc/file/511.nix
 create mode 100644 pkgs/tools/misc/file/python.patch

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
new file mode 100644
index 000000000000..11264223285d
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -0,0 +1,64 @@
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, bison,
+  xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, flex,
+  libXcursor, coreutils, perl }:
+
+stdenv.mkDerivation rec {
+  name = "i3-4.2";
+
+  src = fetchurl {
+    url = "http://i3wm.org/downloads/${name}.tar.bz2";
+    sha256 = "e02c832820e8922a44e744e555294f8580c2f8e218c5c1029e52f1bde048732b";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
+    libstartup_notification libX11 pcre libev yajl flex libXcursor perl ];
+
+  prePatch = ''
+    sed s,/usr/bin/env,${coreutils}/bin/env, -i generate-command-parser.pl
+    sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-migrate-config-to-v4
+    sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-wsbar
+  '';
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, bison,
+  xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, flex,
+  libXcursor, coreutils, perl }:
+
+stdenv.mkDerivation rec {
+  name = "i3-4.2";
+
+  src = fetchurl {
+    url = "http://i3wm.org/downloads/${name}.tar.bz2";
+    sha256 = "e02c832820e8922a44e744e555294f8580c2f8e218c5c1029e52f1bde048732b";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
+    libstartup_notification libX11 pcre libev yajl flex libXcursor perl ];
+
+  prePatch = ''
+    sed s,/usr/bin/env,${coreutils}/bin/env, -i generate-command-parser.pl
+    sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-migrate-config-to-v4
+    sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-wsbar
+  '';
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
new file mode 100644
index 000000000000..08f6585ace9e
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -0,0 +1,150 @@
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
+  pam, libX11, libev, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "i3lock-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
+    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+    libev cairo ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
+  pam, libX11, libev, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "i3lock-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
+    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+    libev cairo ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
+  pam, libX11, libev, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "i3lock-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
+    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+    libev cairo ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
+  pam, libX11, libev, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "i3lock-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
+    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+    libev cairo ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
+  pam, libX11, libev, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "i3lock-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
+    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+    libev cairo ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
+  pam, libX11, libev, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "i3lock-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
+    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+    libev cairo ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
new file mode 100644
index 000000000000..3f0dd1827e5b
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -0,0 +1,144 @@
+{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
+  }:
+
+stdenv.mkDerivation rec {
+  name = "i3status-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3status/${name}.tar.bz2";
+    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
+  };
+
+  buildInputs = [ confuse alsaLib wirelesstools ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
+  }:
+
+stdenv.mkDerivation rec {
+  name = "i3status-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3status/${name}.tar.bz2";
+    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
+  };
+
+  buildInputs = [ confuse alsaLib wirelesstools ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
+  }:
+
+stdenv.mkDerivation rec {
+  name = "i3status-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3status/${name}.tar.bz2";
+    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
+  };
+
+  buildInputs = [ confuse alsaLib wirelesstools ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
+  }:
+
+stdenv.mkDerivation rec {
+  name = "i3status-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3status/${name}.tar.bz2";
+    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
+  };
+
+  buildInputs = [ confuse alsaLib wirelesstools ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
+  }:
+
+stdenv.mkDerivation rec {
+  name = "i3status-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3status/${name}.tar.bz2";
+    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
+  };
+
+  buildInputs = [ confuse alsaLib wirelesstools ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
+  }:
+
+stdenv.mkDerivation rec {
+  name = "i3status-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3status/${name}.tar.bz2";
+    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
+  };
+
+  buildInputs = [ confuse alsaLib wirelesstools ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix
new file mode 100644
index 000000000000..75868a82ebc6
--- /dev/null
+++ b/pkgs/tools/misc/dbacl/default.nix
@@ -0,0 +1,112 @@
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "dbacl-1.14";
+  src = fetchurl {
+    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    md5 = "85bfd88bc20f326dc0f31e794948e21c";
+  };
+
+  meta = {
+    homepage = http://dbacl.sourceforge.net/;
+    longDescription = "a digramic Bayesian classifier for text recognition.";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "dbacl-1.14";
+  src = fetchurl {
+    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    md5 = "85bfd88bc20f326dc0f31e794948e21c";
+  };
+
+  meta = {
+    homepage = http://dbacl.sourceforge.net/;
+    longDescription = "a digramic Bayesian classifier for text recognition.";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "dbacl-1.14";
+  src = fetchurl {
+    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    md5 = "85bfd88bc20f326dc0f31e794948e21c";
+  };
+
+  meta = {
+    homepage = http://dbacl.sourceforge.net/;
+    longDescription = "a digramic Bayesian classifier for text recognition.";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "dbacl-1.14";
+  src = fetchurl {
+    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    md5 = "85bfd88bc20f326dc0f31e794948e21c";
+  };
+
+  meta = {
+    homepage = http://dbacl.sourceforge.net/;
+    longDescription = "a digramic Bayesian classifier for text recognition.";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "dbacl-1.14";
+  src = fetchurl {
+    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    md5 = "85bfd88bc20f326dc0f31e794948e21c";
+  };
+
+  meta = {
+    homepage = http://dbacl.sourceforge.net/;
+    longDescription = "a digramic Bayesian classifier for text recognition.";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "dbacl-1.14";
+  src = fetchurl {
+    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    md5 = "85bfd88bc20f326dc0f31e794948e21c";
+  };
+
+  meta = {
+    homepage = http://dbacl.sourceforge.net/;
+    longDescription = "a digramic Bayesian classifier for text recognition.";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "dbacl-1.14";
+  src = fetchurl {
+    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    md5 = "85bfd88bc20f326dc0f31e794948e21c";
+  };
+
+  meta = {
+    homepage = http://dbacl.sourceforge.net/;
+    longDescription = "a digramic Bayesian classifier for text recognition.";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/tools/misc/file/511.nix b/pkgs/tools/misc/file/511.nix
new file mode 100644
index 000000000000..4e62462b8b35
--- /dev/null
+++ b/pkgs/tools/misc/file/511.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, zlib}:
+ 
+stdenv.mkDerivation rec {
+  name = "file-5.11";
+
+  buildInputs = [ zlib ];
+
+  src = fetchurl {
+    url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz";
+    sha256 = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7";
+  };
+
+  meta = {
+    description = "A program that shows the type of files";
+    homepage = "http://darwinsys.com/file";
+  };
+}
diff --git a/pkgs/tools/misc/file/python.patch b/pkgs/tools/misc/file/python.patch
new file mode 100644
index 000000000000..8ecbc9a81fdc
--- /dev/null
+++ b/pkgs/tools/misc/file/python.patch
@@ -0,0 +1,11 @@
+--- file-5.11/python/magic.py	2011-09-22 18:57:41.000000000 +0200
++++ file-5.11/python/magic.py.1	2012-04-30 15:00:31.750213810 +0200
+@@ -13,7 +13,7 @@
+     Loads the shared library through ctypes and returns a library
+     L{ctypes.CDLL} instance 
+     """
+-    return ctypes.cdll.LoadLibrary(find_library('magic'))
++    return ctypes.CDLL('libmagic.so')
+ 
+ _libraries = {}
+ _libraries['magic'] = _init()