diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix new file mode 100644 index 000000000000..04e50f808274 --- /dev/null +++ b/pkgs/applications/window-managers/i3/default.nix @@ -0,0 +1,32 @@ +{ 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..a1d7409eaf2b --- /dev/null +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -0,0 +1,25 @@ +{ 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..a60db1b38021 --- /dev/null +++ b/pkgs/applications/window-managers/i3/status.nix @@ -0,0 +1,24 @@ +{ 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..f433db68a640 --- /dev/null +++ b/pkgs/tools/misc/dbacl/default.nix @@ -0,0 +1,16 @@ +{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() 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 {