Merge https://github.com/NixOS/nixpkgs

18 files changed, 393 insertions, 27 deletions

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 808ef8d593d6..5b2c5776cf43 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -9,11 +9,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.72";
+  name = "blender-2.72b";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "0wydh5bs1pxnx3ya65lfy3val1s8wz027a5kb4va6wg3aqnwlvlv";
+    sha256 = "0ixz8h3c08p4f84x8r85nzddwvc0h5lw1ci8gdg2x3m2mw2cfdj4";
   };
 
   buildInputs =
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index a9f4071caaec..3cb3c80e1e85 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.5.0";
+  name = "calibre-2.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "0zl2rpwn5xdgwm4ffb5pizk3247wfghl8ilz0i80hyp36zzxgl8p";
+    sha256 = "0j8ypdcrxf961093pw3h5bxhd5kd1i6vjnf9cyi55j54j31zy021";
   };
 
   inherit python;
diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix
new file mode 100644
index 000000000000..1637586eb477
--- /dev/null
+++ b/pkgs/applications/misc/dmenu2/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchhg, libX11, libXinerama, libXft, zlib}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "dmenu2";
+
+  src = fetchhg {
+    url = "https://bitbucket.org/melek/dmenu2";
+    rev = "36cb94a16edf928bdaaa636123392517ed469be0";
+    sha256 = "1b17z5ypg6ij7zz3ncp3irc87raccna10y4w490c872a99lp23lv";
+  };
+
+  buildInputs = [ libX11 libXinerama zlib libXft ];
+
+  postPatch = ''
+    sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run
+  '';
+
+  preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
+
+  meta = {
+      description = "A patched fork of the original dmenu - an efficient dynamic menu for X";
+      homepage = https://bitbucket.org/melek/dmenu2;
+      license = stdenv.lib.licenses.mit;
+      maintainers = with maintainers; [ cstrahan ];
+      platforms = with platforms; all;
+  };
+}
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index b25d347ec873..3a7e5da1e737 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -1,16 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, gtk, gettext }:
+{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "girara-0.2.2";
+  name = "girara-0.2.3";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
-    sha256 = "0lv6wqhx2avdxj6yx111jfs4j32r0xzmmkhy7pgzxpf73kgxz0k3";
+    sha256 = "1phfmqp8y17zcy9yi6pm2f80x8ldbk60iswpm4bmjz5217jwqzxh";
   };
 
   buildInputs = [ pkgconfig gtk gettext ];
 
-  makeFlags = "PREFIX=$(out)";
+  makeFlags = [
+    "PREFIX=$(out)"
+    "TPUT=${ncurses}/bin/tput"
+  ];
 
   meta = {
     homepage = http://pwmt.org/projects/girara/;
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
new file mode 100644
index 000000000000..34bef86f4380
--- /dev/null
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -0,0 +1,110 @@
+# Build procedure lifted from https://aur.archlinux.org/packages/k2/k2pdfopt/PKGBUILD
+{ stdenv, fetchzip, fetchurl, writeScript, libX11, libXext, autoconf, automake, libtool
+      , leptonica, libpng, libtiff, zlib, openjpeg, freetype, jbig2dec, djvulibre
+      , openssl }:
+
+let
+  mupdf_src = fetchurl {
+    url = http://www.mupdf.com/downloads/archive/mupdf-1.5-source.tar.gz;
+    sha256 = "0sl47zqf4c9fhs4h5zg046vixjmwgy4vhljhr5g4md733nash7z4";
+  };
+
+  tess_src = fetchurl {
+    url = http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02.tar.gz;
+    sha256 = "0g81m9y4iydp7kgr56mlkvjdwpp3mb01q385yhdnyvra7z5kkk96";
+  };
+
+  gocr_src = fetchurl {
+    url = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz;
+    sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc";
+  };
+
+in stdenv.mkDerivation rec {
+  name = "k2pdfopt";
+  src = fetchzip {
+    url = http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.21_src.zip;
+    sha256 = "1vy0yw41z6p95gmivjk4r534zbg0kqap4lr9ps56kvjw51q8r54j";
+  };
+
+  buildInputs = [ libX11 libXext autoconf automake libtool leptonica libpng libtiff zlib
+                    openjpeg freetype jbig2dec djvulibre openssl ];
+  NIX_LDFLAGS = "-lX11 -lXext";
+
+  k2_pa = ./k2pdfopt.patch;
+  tess_pa = ./tesseract.patch;
+
+  builder = writeScript "builder.sh" ''
+    . ${stdenv}/setup
+    set -e
+
+    plibs=`pwd`/patched_libraries
+
+    tar zxf ${mupdf_src}
+    cp $src/mupdf_mod/font.c $src/mupdf_mod/string.c mupdf-1.5-source/source/fitz/
+    cp $src/mupdf_mod/pdf-* mupdf-1.5-source/source/pdf
+
+    tar zxf ${tess_src}
+    cp $src/tesseract_mod/dawg.cpp tesseract-ocr/dict
+    cp $src/tesseract_mod/tessdatamanager.cpp tesseract-ocr/ccutil
+    cp $src/tesseract_mod/tessedit.cpp tesseract-ocr/ccmain
+    cp $src/tesseract_mod/tesscapi.cpp tesseract-ocr/api
+    cp $src/include_mod/tesseract.h $src/include_mod/leptonica.h tesseract-ocr/api
+
+    cp -a $src k2pdfopt_v2.21
+    chmod -R +w k2pdfopt_v2.21
+
+    patch -p0 -i $tess_pa
+    patch -p0 -i $k2_pa
+
+    cd tesseract-ocr
+    ./autogen.sh
+    substituteInPlace "configure" \
+            --replace 'LIBLEPT_HEADERSDIR="/usr/local/include /usr/include"' \
+            'LIBLEPT_HEADERSDIR=${leptonica}/include'
+    ./configure --prefix=$plibs --disable-shared
+    make install
+
+    cd ..
+    tar zxf ${gocr_src}
+    cd gocr-0.49
+    ./configure
+    cp src/{gocr.h,pnm.h,unicode.h,list.h} $plibs/include
+    cp include/config.h $plibs/include
+    make libs
+    cp src/libPgm2asc.a $plibs/lib
+
+    cd ../mupdf-1.5-source
+    make prefix=$plibs install
+    install -Dm644 build/debug/libmujs.a $plibs/lib
+
+    cd ../k2pdfopt_v2.21/k2pdfoptlib
+    gcc -Ofast -Wall -c *.c -I ../include_mod/ -I $plibs/include \
+        -I . -I ../willuslib
+    ar rcs libk2pdfopt.a *.o
+
+    cd ../willuslib
+    gcc -Ofast -Wall -c *.c -I ../include_mod/ -I $plibs/include
+    ar rcs libwillus.a *.o
+
+    cd ..
+    gcc -Wall -Ofast -o k2pdfopt.o -c k2pdfopt.c -I k2pdfoptlib/ -I willuslib/ \
+            -I include_mod/ -I $plibs/include
+    g++ -Ofast k2pdfopt.o -o k2pdfopt -I willuslib/ -I k2pdfoptlib/ -I include_mod/ \
+            -I $plibs/include -L $plibs/lib/ \
+            -L willuslib/ -L k2pdfoptlib/ -lk2pdfopt -lwillus -ldjvulibre -lz -lmupdf  \
+            -ljbig2dec -ljpeg -lopenjp2 -lpng -lfreetype -lpthread -lmujs \
+            -lPgm2asc -llept -ltesseract -lcrypto
+
+    mkdir -p $out/bin
+    cp k2pdfopt $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "K2pdfopt optimizes PDF/DJVU files for mobile e-readers (e.g. the Kindle) and smartphones.";
+    homepage = http://www.willus.com/k2pdfopt;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bosu ];
+  };
+}
+
diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
new file mode 100644
index 000000000000..00ac5770ea42
--- /dev/null
+++ b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
@@ -0,0 +1,95 @@
+diff -aur k2pdfopt_v2.21/willuslib/array.c k2pdfopt_v2.21.new/willuslib/array.c
+--- k2pdfopt_v2.21/willuslib/array.c	2014-05-23 16:29:58.000000000 -0300
++++ k2pdfopt_v2.21.new/willuslib/array.c	2014-07-26 11:35:49.829825567 -0300
+@@ -1055,7 +1055,7 @@
+ void arrayf_sort(float *a,int n)
+ 
+     {
+-    sort(a,(long)n);
++    willus_sort(a,(long)n);
+     }
+ 
+ 
+diff -aur k2pdfopt_v2.21/willuslib/math.c k2pdfopt_v2.21.new/willuslib/math.c
+--- k2pdfopt_v2.21/willuslib/math.c	2013-08-15 21:33:50.000000000 -0300
++++ k2pdfopt_v2.21.new/willuslib/math.c	2014-07-26 11:36:02.853170659 -0300
+@@ -532,7 +532,7 @@
+ 
+ 
+ 
+-void sort(float *x,int n)
++void willus_sort(float *x,int n)
+ 
+     {
+     int top,n1;
+diff -aur k2pdfopt_v2.21/willuslib/ocrjocr.c k2pdfopt_v2.21.new/willuslib/ocrjocr.c
+--- k2pdfopt_v2.21/willuslib/ocrjocr.c	2012-11-12 13:09:42.000000000 -0300
++++ k2pdfopt_v2.21.new/willuslib/ocrjocr.c	2014-07-26 11:36:46.699837185 -0300
+@@ -29,6 +29,8 @@
+ #ifdef HAVE_GOCR_LIB
+ #include <gocr.h>
+ 
++job_t *JOB;
++
+ /*
+ ** bmp8 must be grayscale
+ ** (x1,y1) and (x2,y2) from top left of bitmap
+@@ -66,6 +68,7 @@
+     h=y2-y1+1;
+     dh=h+bw*2;
+     job=&_job;
++    JOB=job;
+     job_init(job);
+     job_init_image(job);
+     // willus_mem_alloc_warn((void **)&job->src.p.p,w*h,funcname,10);
+diff -aur k2pdfopt_v2.21/willuslib/string.c k2pdfopt_v2.21.new/willuslib/string.c
+--- k2pdfopt_v2.21/willuslib/string.c	2014-02-03 00:37:44.000000000 -0300
++++ k2pdfopt_v2.21.new/willuslib/string.c	2014-07-26 11:37:01.766506277 -0300
+@@ -81,7 +81,7 @@
+ ** Returns NULL if EOF, otherwise returns pointer to the string.
+ **
+ */
+-char *get_line(char *buf,int max,FILE *f)
++char *willus_get_line(char *buf,int max,FILE *f)
+ 
+     {
+     int     i;
+diff -aur k2pdfopt_v2.21/willuslib/willus.h k2pdfopt_v2.21.new/willuslib/willus.h
+--- k2pdfopt_v2.21/willuslib/willus.h	2014-07-25 15:03:51.000000000 -0300
++++ k2pdfopt_v2.21.new/willuslib/willus.h	2014-07-26 11:37:56.316506038 -0300
+@@ -214,9 +214,6 @@
+ ** CMAKE handles the defines, not this source
+ ** (Mod from Dirk Thierbach, 31-Dec-2013)
+ */
+-#ifdef USE_CMAKE
+-#include "config.h"
+-#else /* USE_CMAKE */
+ 
+ #ifndef HAVE_Z_LIB
+ #define HAVE_Z_LIB
+@@ -268,7 +265,6 @@
+ #undef HAVE_GSL_LIB
+ #endif
+ 
+-#endif /* USE_CMAKE */
+ /*
+ ** Consistency check
+ */
+@@ -533,7 +529,7 @@
+                       int *n,FILE *err);
+ int    readxyz_ex    (char *filename,double **x,double **y,double **z,
+                       int *n,FILE *err,int ignore_after_semicolon);
+-void   sort          (float *x,int n);
++void   willus_sort          (float *x,int n);
+ void   sortd         (double *x,int n);
+ void   sorti         (int *x,int n);
+ void   sortxy        (float *x,float *y,int n);
+@@ -602,7 +598,7 @@
+ /* string.c */
+ void   clean_line    (char *buf);
+ void   clean_line_end(char *buf);
+-char  *get_line      (char *buf,int max,FILE *f);
++char  *willus_get_line      (char *buf,int max,FILE *f);
+ char  *get_line_cf   (char *buf,int max,FILE *f);
+ int   mem_get_line_cf(char *buf,int maxlen,char *cptr,long *cindex,long csize);
+ int    in_string     (char *buffer,char *pattern);
diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/pkgs/applications/misc/k2pdfopt/tesseract.patch
new file mode 100644
index 000000000000..5cb6e0fe3176
--- /dev/null
+++ b/pkgs/applications/misc/k2pdfopt/tesseract.patch
@@ -0,0 +1,12 @@
+diff -aur tesseract-ocr/api/Makefile.am tesseract-ocr.new/api/Makefile.am
+--- tesseract-ocr/api/Makefile.am	2012-10-09 14:18:39.000000000 -0300
++++ tesseract-ocr.new/api/Makefile.am	2014-03-20 18:43:13.926030341 -0300
+@@ -36,7 +36,7 @@
+ if VISIBILITY
+ libtesseract_api_la_CPPFLAGS += -DTESS_EXPORTS
+ endif
+-libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp
++libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp tesscapi.cpp
+ 
+ lib_LTLIBRARIES += libtesseract.la
+ libtesseract_la_LDFLAGS = 
diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
new file mode 100644
index 000000000000..17da22cbaafc
--- /dev/null
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -0,0 +1,39 @@
+{stdenv, fetchurl, qt4, pkgconfig, popplerQt4, djvulibre, libspectre, cups
+, file, ghostscript
+}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="qpdfview";
+    version="0.4.12";
+    name="${baseName}-${version}";
+    url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz";
+    sha256="1h6lrrh1vblqkxrd89nmid7d21anyn30iahj24z62yny35lidf0g";
+  };
+  buildInputs = [
+    qt4 popplerQt4 pkgconfig djvulibre libspectre cups file ghostscript
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+  configurePhase = ''
+    qmake *.pro
+    for i in *.pro; do 
+      qmake "$i" -o "Makefile.$(basename "$i" .pro)"
+    done
+    sed -e "s@/usr/@$out/@g" -i Makefile*
+  '';
+  meta = {
+    inherit (s) version;
+    description = "A tabbed document viewer";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://launchpad.net/qpdfview";
+    updateWalker = true;
+  };
+}
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index a8338b80c9e4..60322c2b911e 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
                          "-I${dbus_libs}/lib/dbus-1.0/include" ];
 
   # Fix up python path so the lockfile library is on it.
-  PYTHONPATH = stdenv.lib.makeSearchPath "lib/${pythonFull.python.libPrefix}/site-packages" [
+  PYTHONPATH = stdenv.lib.makeSearchPath "lib/${pythonFull.libPrefix}/site-packages" [
     pythonPackages.curses pythonPackages.lockfile
   ];
 
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
new file mode 100644
index 000000000000..98f2e0d61083
--- /dev/null
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation {
+  name = "urxvt-perls";
+
+  src = fetchgit {
+    url = "https://github.com/muennich/urxvt-perls";
+    rev = "4dec629b3631297d17855c35be1b723e2d9e7591";
+    sha256 = "c61bc8819b4e6655ed4a3ce3b347cb6dbebcb484d5d3973cbe9aa7f2c98d372f";
+  };
+
+  installPhase = ''
+    mkdir -p $out/lib/urxvt/perl
+    cp clipboard \
+       keyboard-select \
+       url-select \
+    $out/lib/urxvt/perl
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Perl extensions for the rxvt-unicode terminal emulator";
+    homepage = "https://github.com/muennich/urxvt-perls";
+    license = licenses.gpl2;
+    maintainers = maintainers.abbradar;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
new file mode 100644
index 000000000000..a636c3bcfe56
--- /dev/null
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation {
+  name = "urxvt-tabbedex";
+
+  src = fetchgit {
+    url = "https://github.com/mina86/urxvt-tabbedex";
+    rev = "54c8d6beb4d65278ed6db24693ca56e1ee65bb42";
+    sha256 = "f8734ee289e1cfc517d0699627191c98d32ae3549e0f1935af2a5ccb86d4dc1e";
+  };
+
+  installPhase = ''
+    install -D tabbedex $out/lib/urxvt/perl/tabbedex
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)";
+    homepage = "https://github.com/mina86/urxvt-tabbedex";
+    maintainers = maintainers.abbradar;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix
new file mode 100644
index 000000000000..140113de64a3
--- /dev/null
+++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildEnv, rxvt_unicode, makeWrapper, plugins }:
+
+let
+  rxvt = rxvt_unicode.override {
+    perlSupport = true;
+  };
+
+  drv = buildEnv {
+    name = "${rxvt.name}-with-plugins";
+
+    paths = [ rxvt ] ++ plugins;
+
+    postBuild = ''
+      # TODO: This could be avoided if buildEnv could be forced to create all directories
+      if [ -L $out/bin ]; then
+        rm $out/bin
+        mkdir $out/bin
+        for i in ${rxvt}/bin/*; do
+          ln -s $i $out/bin
+        done
+      fi
+      wrapProgram $out/bin/urxvt \
+        --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl"
+    '';
+  };
+in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
\ No newline at end of file
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index 96ca38f581f8..37076d242c44 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "termite-${version}";
-  version = "v7";
+  version = "8";
 
   src = fetchgit {
-    url = "https://github.com/thestinger/termite";
-    rev = "f0ff025c1bb6a1e3fd83072f00c2dc42a0701f46";
-    sha256 = "057yzlqvp84fkmhn4bz9071glj4rh4187xhg48cdppf2w6phcbxp";
+    url = "https://github.com/thestinger/termite.git";
+    rev = "05f3bbf626245a344eb74859ef2aa49f715ebd55";
+    sha256 = "01dfg4zg7sgw0cbh0j9sbwdvn43rw7xfcnijfh1dhd6n5yx00b18";
   };
 
-  makeFlags = "VERSION=${version}";
+  makeFlags = "VERSION=v${version}";
 
   buildInputs = [pkgconfig vte gtk ncurses];
 
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 5f44f79ebcdd..718670f569b7 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,17 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper, zathura_icon }:
+{ stdenv, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils, file, makeWrapper, zathura_icon }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.9";
+  version = "0.3.1";
   name = "zathura-core-${version}";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
-    sha256 = "17z05skjk95115ajp6459k1djadza1w8kck7jn1qnd697r01s1rc";
+    sha256 = "1wwjj7vnzpkvn83674mapapvl2qsn7y44w17lq63283j1lic00mm";
   };
 
   buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ];
 
-  makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ];
+  makeFlags = [
+    "PREFIX=$(out)"
+    "RSTTOMAN=${docutils}/bin/rst2man.py"
+    "VERBOSE=1"
+    "TPUT=${ncurses}/bin/tput"
+  ];
 
   postInstall = ''
     wrapProgram "$out/bin/zathura" \
diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index 1a4ab3d772c5..6f1b5f400dd1 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -1,7 +1,7 @@
-{ callPackage, pkgs, fetchurl, useMupdf }:
+{ callPackage, pkgs, fetchurl, stdenv, useMupdf }:
 
 rec {
-  inherit (pkgs) stdenv;
+  inherit stdenv;
 
   icon = ./icon.xpm;
 
diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix
index 1a2347f27277..00c5464b7d13 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "zathura-djvu-0.2.3";
+  name = "zathura-djvu-0.2.4";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "12gd8kb0al5mknh4rlvxzgzwz3vhjggqjh8ws27phaq14paq4vn1";
+    sha256 = "1g1lafmrjbx0xv7fljdmyqxx0k334sq4q6jy4a0q5xfrgz0bh45c";
   };
 
   buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ];
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/config.patch b/pkgs/applications/misc/zathura/pdf-mupdf/config.patch
index c7d172c92634..6445fab22989 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/config.patch
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/config.patch
@@ -1,10 +1,10 @@
---- zathura-pdf-mupdf-0.2.6/config.mk
-+++ zathura-pdf-mupdf-0.2.6/config.mk
+--- zathura-pdf-mupdf-0.2.7/config.mk
++++ zathura-pdf-mupdf-0.2.7/config.mk
 @@ -32,10 +32,11 @@
  OPENSSL_INC ?= $(shell pkg-config --cflags libcrypto)
  OPENSSL_LIB ?= $(shell pkg-config --libs libcrypto)
  
--MUPDF_LIB ?= -lmupdf -lmupdf-js-none
+-MUPDF_LIB ?= -lmupdf -lmujs
 +MUPDF_INC ?= $(shell pkg-config --cflags mupdf)
 +MUPDF_LIB ?= $(shell pkg-config --libs mupdf)
  
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index 4e585d852a2a..a6f12a64cf00 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl, openjpeg, libjpeg, jbig2dec }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.6";
+  version = "0.2.7";
   name = "zathura-pdf-mupdf-${version}";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "5df94b6f906008b5f3bca770a552da6d2917d6b8d3e4b3049cb7001302041b20";
+    sha256 = "0gr5kkk75hn7sz9kmzynhhcdd9xb9sz5gdb8p1iz9g0fjhskyd5i";
   };
 
   buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf openjpeg libjpeg jbig2dec ];