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

Conflicts:
	pkgs/development/libraries/poppler/default.nix

6 files changed, 75 insertions, 12 deletions

diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix
new file mode 100644
index 000000000000..ff846ac0933d
--- /dev/null
+++ b/pkgs/tools/text/discount/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+  version = "2.1.6";
+  name = "discount-${version}";
+
+  src = fetchurl {
+    url = "http://www.pell.portland.or.us/~orc/Code/discount/discount-${version}.tar.bz2";
+    sha256 = "15h726m5yalq15hkxxfw4bxwd6wkwkan5q7s80pgi1z32ygb4avh";
+  };
+  patches = ./fix-configure-path.patch;
+  configureScript = "./configure.sh";
+
+  meta = with stdenv.lib; {
+    description = "Implementation of Markdown markup language in C";
+    homepage = "http://www.pell.portland.or.us/~orc/Code/discount/";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.shell ];
+  };
+}
diff --git a/pkgs/tools/text/discount/fix-configure-path.patch b/pkgs/tools/text/discount/fix-configure-path.patch
new file mode 100644
index 000000000000..045b369b4b69
--- /dev/null
+++ b/pkgs/tools/text/discount/fix-configure-path.patch
@@ -0,0 +1,12 @@
+diff -rupN discount-2.1.6-original/configure.inc discount-2.1.6/configure.inc
+--- discount-2.1.6-original/configure.inc	2014-10-10 15:34:24.158325345 +0100
++++ discount-2.1.6/configure.inc	2014-10-10 15:34:33.553325321 +0100
+@@ -32,7 +32,7 @@
+ # this preamble code is executed when this file is sourced and it picks
+ # interesting things off the command line.
+ #
+-ac_default_path="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"
++ac_default_path=$PATH
+ 
+ ac_standard="--src=DIR		where the source lives (.)
+ --prefix=DIR		where to install the final product (/usr/local)
diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix
new file mode 100644
index 000000000000..1ac9901a8e17
--- /dev/null
+++ b/pkgs/tools/text/gist/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, fetchurl
+, makeWrapper
+, ruby
+, rake
+}:
+
+let version = "v4.3.0";
+in stdenv.mkDerivation rec {
+  name = "gist-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/defunkt/gist/archive/${version}.tar.gz";
+    sha256 = "92b91ffe07cc51ca8576b091e7123b851ee0d7d2d3f0e21d18b19d8bd8f9aa47";
+  };
+
+  buildInputs = [ rake makeWrapper ];
+
+  installPhase = ''
+    rake install prefix=$out
+
+    wrapProgram $out/bin/gist \
+      --prefix PATH : ${ruby}/bin \
+  '';
+
+  meta = {
+    homepage = "http://defunkt.io/gist/";
+    description = "upload code to https://gist.github.com (or github enterprise)";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix
index be49ba509200..619e1f8d9b1b 100644
--- a/pkgs/tools/text/peco/default.nix
+++ b/pkgs/tools/text/peco/default.nix
@@ -3,27 +3,27 @@
 let
   go-flags = fetchgit {
     url = "git://github.com/jessevdk/go-flags";
-    rev = "4f0ca1e2d1349e9662b633ea1b8b8d48e8a32533";
-    sha256 = "5f22f4c5a0529ff0da8e507462ad910bb73c513fde49d58dd4baf7332787ca3d";
+    rev = "ef51ed2000ee1721c7153e958511907b844b4a9c";
+    sha256 = "1abzc7ksglicaz6g6nry006vwvflsidvyzyig85pi3p852z6sc2j";
   };
   go-runewidth = fetchgit {
     url = "git://github.com/mattn/go-runewidth";
-    rev = "36f63b8223e701c16f36010094fb6e84ffbaf8e0";
-    sha256 = "718e9e04659441744b8d43bd3d7e806836194cf322962712a6e019311d407ecf";
+    rev = "63c378b851290989b19ca955468386485f118c65";
+    sha256 = "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d";
   };
   termbox-go = fetchgit {
     url = "git://github.com/nsf/termbox-go";
-    rev = "4e63c3a917c197694cb4fef6c55582500b3741e3";
-    sha256 = "00ecc0dcf0919a42ea06fe3bd93480a17241160c434ff3872b6f5e418eb18069";
+    rev = "bb19a81afd4bc2729799d1fedb19f7bd7ee284cf";
+    sha256 = "1zc8pb594l16yipis6xg2ra84bg315p63wqxa5abyam1y0333sn0";
   };
 in stdenv.mkDerivation rec {
   name = "peco-${version}";
-  version = "0.2.3";
+  version = "0.2.10";
 
   src = fetchgit {
     url = "git://github.com/peco/peco";
-    rev = "b8e0c8f37d3eed68e64c931b0edb77728f3723f9";
-    sha256 = "f178e01ab0536770b17eddcefd863e68c2d65b527b5da1fc3fb9efb19c12635f";
+    rev = "4952013023ae1d92c10d826e6970c5a68959678d";
+    sha256 = "02fwmxhaydx9m6q146amq1aw44abzisskkblmv1sjxrm37x81l31";
   };
 
   buildInputs = [ go ];
diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix
index aea3ab2bd968..74f7e08900a7 100644
--- a/pkgs/tools/text/xml/xmlstarlet/default.nix
+++ b/pkgs/tools/text/xml/xmlstarlet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libxml2, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "xmlstarlet-1.5.0";
+  name = "xmlstarlet-1.6.1";
   
   src = fetchurl {
     url = "mirror://sourceforge/xmlstar/${name}.tar.gz";
-    sha256 = "1fmvqvzrzyfcg53j39sdz01v7klzyhd011m3y9br54525q2fvd27";
+    sha256 = "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m";
   };
 
   buildInputs = [ pkgconfig libxml2 libxslt ];
diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix
index 3ff89294ab1d..e1957333b3fb 100644
--- a/pkgs/tools/text/xml/xpf/default.nix
+++ b/pkgs/tools/text/xml/xpf/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   
   src = fetchurl {
     url = http://tarballs.nixos.org/xpf-0.2.tar.gz;
-    md5 = "d92658828139e1495e052d0cfe25d312";
+    sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz";
   };
   
   buildInputs = [python libxml2];