Merge remote-tracking branch 'origin/master' into staging.

11 files changed, 83 insertions, 113 deletions

diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index 3ba7b5903f9..b4829a1bcf7 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -1,28 +1,28 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, glib, libid3tag, id3lib, taglib
-, libvorbis, libogg, flac, itstool, libxml2
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib
+, libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas
+, makeWrapper, gnome_icon_theme
 }:
 
 stdenv.mkDerivation rec {
   name = "easytag-${version}";
-  version = "2.2.4";
+  version = "2.3.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/easytag/2.2/${name}.tar.xz";
-    sha256 = "14f0s0l28fwxnc37aw1imal2xcg9ykq35mx2j9gaqzz02ymjk0s5";
+    url = "mirror://gnome/sources/easytag/2.3/${name}.tar.xz";
+    sha256 = "19cdx4hma4nl38m1zrc3mq9cjg6knw970abk5anhg7cvpc1371s7";
   };
 
-  preConfigure = ''
-    # pkg-config v0.23 should be enough.
-    sed -i -e '/_pkg_min_version=0.24/s/24/23/' \
-           -e 's/have_mp3=no/have_mp3=yes/' \
-           -e 's/ID3TAG_DEPS="id3tag"/ID3TAG_DEPS=""/' configure
+  preFixup = ''
+    wrapProgram $out/bin/easytag \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
   '';
 
   NIX_LDFLAGS = "-lid3tag -lz";
 
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
-    pkgconfig intltool gtk glib libid3tag id3lib taglib libvorbis libogg flac
-    itstool libxml2
+    pkgconfig intltool gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
+    itstool libxml2 gsettings_desktop_schemas gnome_icon_theme
   ];
 
   meta = {
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
new file mode 100644
index 00000000000..bc9163e63cb
--- /dev/null
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, qt4, pkgconfig, hunspell}:
+
+stdenv.mkDerivation rec {
+  name = "focuswriter-${version}";
+  version = "1.5.3";
+
+  src = fetchurl {
+    url = http://gottcode.org/focuswriter/focuswriter-1.5.3-src.tar.bz2;
+    sha256 = "1i58jxbiy95ijf81g8c3gwxhcg3irzssna3wv7vhrd57g4lcfj0w";
+  };
+
+  buildInputs = [ qt4 pkgconfig hunspell ];
+  
+  configurePhase = "qmake PREFIX=/";
+
+  installPhase = "make install INSTALL_ROOT=$out";
+
+  meta = {
+    description = "Simple, distraction-free writing environment";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.madjar ];
+    platforms = stdenv.lib.platforms.all;
+    homepage = "http://gottcode.org/focuswriter/";
+  };
+}
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 3cb3c80e1e8..a23c939789b 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.7.0";
+  name = "calibre-2.8.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "0j8ypdcrxf961093pw3h5bxhd5kd1i6vjnf9cyi55j54j31zy021";
+    sha256 = "0wjkcgv7y4ll4lh5av6zs0q3k9y6p36sndw3864zhgwqwff00k12";
   };
 
   inherit python;
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index f611eb823bb..b58f0a5703c 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
 
 let
   name = "ikiwiki";
-  version = "3.20140916";
+  version = "3.20141016";
 
   lib = stdenv.lib;
 in
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "05nws8jkcbhg767wqgn7in1p8zbcx2kdnhxz19fq52ncfzk2ndn0";
+    sha256 = "1amvrb6djil7g0yabsngfs0f1n7qcvj2hddipjkgfjbmghd6jqiw";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
index ba3f041738a..c9b8a959bf9 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
@@ -1,46 +1,32 @@
-{ stdenv, fetchurl, pidgin, imagemagick, ghostscript
-, pkgconfig, glib, gtk, texLive
-}:
-        
+{ stdenv, fetchurl, pkgconfig, pidgin, texLive, imagemagick, glib, gtk }:
+
+let version = "1.5.0";
+in
 stdenv.mkDerivation {
-  name = "pidgin-latex";
+  name = "pidgin-latex-${version}";
 
   src = fetchurl {
-    url = http://tapas.affenbande.org/pidgin-latex/pidgin-latex-0.9.tgz;
-    sha256 = "1yqd3qgxd3n8hm60qg7yv7j1crr6f3d4yrdpgwdpw2pyf92p8nxp";
+    url = "mirror://sourceforge/pidgin-latex/pidgin-latex_${version}.tar.bz2";
+    sha256 = "9c850aee90d7e59de834f83e09fa6e3e51b123f06e265ead70957608ada95441";
   };
 
-  preBuild = ''
-    sed -e '/^PREFIX/d' -i Makefile ; 
-    sed -e 's@/usr/bin/latex@${texLive}/bin/pdflatex@g' -i pidgin-latex.h
-    sed -e 's@/usr/bin/convert@${imagemagick}/bin/convert@g' -i pidgin-latex.h
-    sed -e 's@.*convert_path.*@const gchar *convert = CONVERT_PATH;@'
-    sed -e 's@.*latex_path.*@const gchar *convert = LATEX_PATH;@'
-    sed -e 's/%s.dvi/%s.pdf/' -i pidgin-latex.c
-    sed -e 's/latex_system\(.*\)FALSE/latex_system\1TRUE/' -i pidgin-latex.c
-  '';
-
-  makeFlags = "PREFIX=\$(out)";
+  nativeBuildInputs = [pkgconfig];
+  buildInputs = [gtk glib pidgin];
+  makeFlags = "PREFIX=$(out)";
 
-  preInstall = "mkdir -p $out/lib/pidgin $out/bin";
-  
-  postInstall = ''
-    mkdir -p $out/share/pidgin-latex
-    ln -s $out/lib/pidgin/pidgin-latex.so $out/share/pidgin-latex/
+  postPatch = ''
+    sed -e 's/-Wl,-soname//' -i Makefile
   '';
 
-  buildInputs = [pidgin imagemagick ghostscript pkgconfig glib gtk texLive];
+  passthru = {
+    wrapArgs = "--prefix PATH ':' ${texLive}/bin:${imagemagick}/bin";
+  };
 
-  meta = {
-    longDescription = ''
-      Pidgin-LaTeX is a pidgin plugin that cuts everything inside \$\$
-      .. \$\$ and feeds to LaTeX. A bit of conversion (automated, of
-      course) - and you see every formula that occurs in conversation
-      in pretty graphical form.  There are some glitches - when a
-      formula fails to compile, you can see just previous formula..
-      Enable it for user by linking to ~/.purple/plugins - from
-      sw/share/pidgin-latex , not from store of course.
-    '';
-    homepage = http://tapas.affenbande.org/wordpress/?page_id=70;
+  meta = with stdenv.lib; {
+    homepage = http://sourceforge.net/projects/pidgin-latex/;
+    description = "LaTeX rendering plugin for Pidgin IM";
+    licenses = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = maintainers.abbradar;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix
deleted file mode 100644
index 840416b7d17..00000000000
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-args : with args;
-let version = "1.5.0";
-in
-rec {
-  src = fetchurl {
-    url = "mirror://sourceforge/pidgin-latex/pidgin-latex_${version}.tar.bz2";
-    sha256 = "9c850aee90d7e59de834f83e09fa6e3e51b123f06e265ead70957608ada95441";
-  };
-
-  buildInputs = [texLive pkgconfig gtk imagemagick glib pidgin which];
-  configureFlags = [];
-  installFlags = [
-    "PREFIX=$out"
-  ];
-
-  preBuild = fullDepEntry (''
-    mkdir -p $out/bin
-    ln -s $(which convert) $out/bin
-    ln -s $(which xelatex) $out/bin
-    ln -s $(which dvips) $out/bin
-
-    sed -e 's/-Wl,-soname//' -i Makefile
-    sed -e 's/\(PATH("\)latex/\1xelatex/' -i LaTeX.c
-    sed -e 's/|| execute(cmddvips, dvipsopts, 10) //' -i LaTeX.c
-    sed -e 's/  strcat([*]file_ps, "[.]ps");/  strcat(*file_ps, ".pdf");/' -i LaTeX.c
-    sed -e 's/\([*]convertopts\[5\]=[{]"\)\(\\"",\)/\1 -trim \2/' -i LaTeX.c
-    sed -e 's/\(#define HEADER ".*\)12pt\(.*\)"/\116pt\2\\\\usepackage{fontspec}\\\\usepackage{xunicode}"/' -i LaTeX.h
-  '') ["minInit" "addInputs" "defEnsureDir" "doUnpack"];
-
-  postInstall = fullDepEntry (''
-    mkdir -p $out/lib
-    mkdir -p $out/share/pidgin-latex
-    ln -s ../../lib/pidgin/LaTeX.so  $out/share/pidgin-latex 
-  '') ["minInit" "defEnsureDir" "doMakeInstall"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = [ "preBuild" "doMakeInstall" "postInstall"];
-
-  name = "pidgin-latex-${version}";
-  meta = {
-    description = "LaTeX rendering plugin for Pidgin IM";
-    priority = "10";
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
index 46477e8dcd0..0c498dd612e 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
@@ -1,6 +1,8 @@
 { stdenv, buildEnv, pidgin, makeWrapper, plugins }:
 
-let drv = buildEnv {
+let
+extraArgs = map (x: x.wrapArgs or "") plugins;
+drv = buildEnv {
   name = "pidgin-with-plugins-" + (builtins.parseDrvName pidgin.name).version;
 
   paths = [ pidgin ] ++ plugins;
@@ -15,7 +17,8 @@ let drv = buildEnv {
       done
     fi
     wrapProgram $out/bin/pidgin \
-      --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.version} $out/lib/pidgin"
+      --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.version} $out/lib/pidgin" \
+      ${toString extraArgs}
   '';
   };
 in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index edba65146a6..097de96e3e3 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "R-3.1.0";
+  name = "R-3.1.2";
 
   src = fetchurl {
     url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "1qjzbw341bvi1h4jwbvdkvq8j0z9l3m85mpgrlfw0n2cz2806s4a";
+    sha256 = "0ypsm11c7n49pgh2ricyhhpfhas3famscdazzdp2zq70rapm1ldw";
   };
 
   buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt
@@ -54,7 +54,8 @@ stdenv.mkDerivation rec {
 
   installTargets = [ "install" "install-info" "install-pdf" ];
 
-  doCheck = true;
+  # The test suite fails when building without the recommended packages.
+  doCheck = withRecommendedPackages;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix
index abfb20baff2..d5f03a41f22 100644
--- a/pkgs/applications/version-management/darcs/default.nix
+++ b/pkgs/applications/version-management/darcs/default.nix
@@ -24,7 +24,7 @@ cabal.mkDerivation (self: {
     mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
   '';
   patchPhase = ''
-    sed -i -e 's|random.*==.*|random|' darcs.cabal
+    sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' darcs.cabal
   '';
   meta = {
     homepage = "http://darcs.net/";
diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
index ca329eddc66..50c42c5c9d4 100644
--- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
@@ -1,19 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, extensibleExceptions, filepath, git, github, hslogger
-, IfElse, MissingH, mtl, network, optparseApplicative, prettyShow
-, text, unixCompat
+{ cabal, exceptions, filepath, git, github, hslogger, IfElse
+, MissingH, mtl, network, networkUri, optparseApplicative
+, prettyShow, text, transformers, unixCompat
 }:
 
 cabal.mkDerivation (self: {
   pname = "github-backup";
-  version = "1.20140721";
-  sha256 = "0bnkfmgpk1iaaqck4ppn461fzk3s2761w2nxfrvw10gc934lhrxc";
+  version = "1.20141031";
+  sha256 = "1rg8hz7g12k6h3vflm51l6gdi0wckmxwdq1213ykrbl8w8bvlkm8";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    extensibleExceptions filepath github hslogger IfElse MissingH mtl
-    network optparseApplicative prettyShow text unixCompat
+    exceptions filepath github hslogger IfElse MissingH mtl network
+    networkUri optparseApplicative prettyShow text transformers
+    unixCompat
   ];
   buildTools = [ git ];
   meta = {
@@ -21,7 +22,5 @@ cabal.mkDerivation (self: {
     description = "backs up everything github knows about a repository, to the repository";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 7f8091067cb..a697aaa08a1 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation {
-  name = "git-repo-1.20";
+  name = "git-repo-1.21";
   src = fetchurl {
-    # I could not find a versioned url for the 1.20 version. In case
+    # I could not find a versioned url for the 1.21 version. In case
     # the sha mismatches, check the homepage for new version and sha.
     url = "http://commondatastorage.googleapis.com/git-repo-downloads/repo";
-    sha1 = "e197cb48ff4ddda4d11f23940d316e323b29671c";
+    sha1 = "b8bd1804f432ecf1bab730949c82b93b0fc5fede";
   };
 
   unpackPhase = "true";