Merge branch 'origin/master' into stdenv-updates.

Conflicts:
	pkgs/tools/misc/less/default.nix

13 files changed, 109 insertions, 110 deletions

diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 8aea7bc8aa8e..9d3859851ee0 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -4,14 +4,14 @@
 
 let
   name = "cppcheck";
-  version = "1.53";
+  version = "1.62";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2";
-    sha256 = "878db83d3954d0c45135362308da951ec0670a160c76a7410466a9b539e8677f";
+    sha256 = "031x2khbk0anlacpdk5g5r3q3y4xj0z5zsfhf2wcv189hxl7698c";
   };
 
   configurePhase = "makeFlags=PREFIX=$out";
diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix
index 21064ebe870a..a8d376ef23c8 100644
--- a/pkgs/development/tools/analysis/lcov/default.nix
+++ b/pkgs/development/tools/analysis/lcov/default.nix
@@ -1,16 +1,15 @@
 {stdenv, fetchurl, perl}:
 
 stdenv.mkDerivation rec {
-  name = "lcov-1.9";
+  name = "lcov-1.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/ltp/${name}.tar.gz";
-    sha256 = "1jhs1x2qy5la5gpdfl805zm11rsz6anla3b0wffk6wq79xfi4zn3";
+    sha256 = "13xq2ln4jjasslqzzhr5g11q1c19gwpng1jphzbzmylmrjz62ila";
   };
 
   patches =
-    [ ./find-source.patch ]
-    ++ (stdenv.lib.optional stdenv.isFreeBSD ./freebsd-install.patch);
+    (stdenv.lib.optional stdenv.isFreeBSD ./freebsd-install.patch);
 
   preBuild = ''
     makeFlagsArray=(PREFIX=$out BIN_DIR=$out/bin MAN_DIR=$out/share/man)
diff --git a/pkgs/development/tools/analysis/lcov/find-source.patch b/pkgs/development/tools/analysis/lcov/find-source.patch
deleted file mode 100644
index 428ae399d4ea..000000000000
--- a/pkgs/development/tools/analysis/lcov/find-source.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- lcov-1.8/bin/geninfo	2010-01-29 11:14:46.000000000 +0100
-+++ lcov-1.8/bin/geninfo	2010-04-18 23:33:43.000000000 +0200
-@@ -51,6 +51,7 @@
- 
- use strict;
- use File::Basename; 
-+use Cwd qw(abs_path);
- use File::Spec::Functions qw /abs2rel catdir file_name_is_absolute splitdir
- 			      splitpath rel2abs/;
- use Getopt::Long;
-@@ -95,6 +96,7 @@ sub match_filename($@);
- sub solve_ambiguous_match($$$);
- sub split_filename($);
- sub solve_relative_path($$);
-+sub find_source_file($$);
- sub read_gcov_header($);
- sub read_gcov_file($);
- sub info(@);
-@@ -964,7 +966,7 @@ sub process_dafile($$)
- 
- 		if (defined($source))
- 		{
--			$source = solve_relative_path($base_dir, $source);
-+ 			$source = find_source_file($base_dir, $source);
- 		}
- 
- 		# gcov will happily create output even if there's no source code
-@@ -981,18 +983,9 @@ sub process_dafile($$)
- 			die("ERROR: could not read source file $source\n");
- 		}
- 
--		@matches = match_filename(defined($source) ? $source :
--					  $gcov_file, keys(%{$instr}));
-+		next if ! -r $source;
- 
--		# Skip files that are not mentioned in the graph file
--		if (!@matches)
--		{
--			warn("WARNING: cannot find an entry for ".$gcov_file.
--			     " in $graph_file_extension file, skipping ".
--			     "file!\n");
--			unlink($gcov_file);
--			next;
--		}
-+		@matches = ($source);
- 
- 		# Read in contents of gcov file
- 		@result = read_gcov_file($gcov_file);
-@@ -1242,6 +1235,25 @@ sub solve_relative_path($$)
- }
- 
- 
-+sub find_source_file($$)
-+{
-+        my ($base_dir, $source) = @_;
-+        my $dir = $base_dir;
-+
-+        # Hack to make absolute paths work on Nixpkgs coverage
-+        # reports.  The source is in /nix/store/<bla>/.build/<bla>.
-+        $source = $1 if $source =~ /^\/.*\/\.build\/(.*)$/;
-+        
-+        while (!-e "$dir/$source") {
-+                $dir = $dir . "/..";
-+                if (length $dir > 1000) {
-+                        return "$base_dir/$source";
-+                }
-+        }
-+        return abs_path("$dir/$source");
-+}
-+
-+
- #
- # match_filename(gcov_filename, list)
- #
-@@ -1918,7 +1930,7 @@ sub process_graphfile($$)
- 
- 	# Get path to data file in absolute and normalized form (begins with /,
- 	# contains no more ../ or ./)
--	$graph_filename = solve_relative_path($cwd, $graph_filename);
-+	$graph_filename = find_source_file($cwd, $graph_filename);
- 
- 	# Get directory and basename of data file
- 	($graph_dir, $graph_basename) = split_filename($graph_filename);
-
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 4f2ef6df8498..69c1f4181cc7 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, perl, flex, bison, qt4 }:
 
 let
-  name = "doxygen-1.8.3.1";
+  name = "doxygen-1.8.5";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz";
-    sha256 = "0m9bwxg9g2h5fp9as0l0rmibm9ing39nssfrn3608v0v21l9yx0c";
+    sha256 = "09fcsz1rd4a9njsz3as7z8s3mk621pvcclavxbb6ib8jvdkqnfi4";
   };
 
   patches = [ ./tmake.patch ];
diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
index 374002e8d6ca..b653c705478d 100644
--- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
@@ -2,11 +2,11 @@
 , makeWrapper, pythonPackages }:
 
 stdenv.mkDerivation {
-  name = "gnome-doc-utils-0.20.7";
+  name = "gnome-doc-utils-0.20.10";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.7.tar.xz;
-    sha256 = "01lcq6gm4q9awvg7lccq43qh8g4ibz49s2mgykin78mgph9h396q";
+    url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz;
+    sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb";
   };
 
   configureFlags = "--disable-scrollkeeper";
diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix
index 6128406bbe5b..c7cda38ef431 100644
--- a/pkgs/development/tools/misc/astyle/default.nix
+++ b/pkgs/development/tools/misc/astyle/default.nix
@@ -2,14 +2,14 @@
 
 let
   name = "astyle";
-  version = "2.02.1";
+  version = "2.04";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}_${version}_linux.tar.gz";
-    sha256 = "0bece9a32887e51f42c57617cf7c4f9b63d0a386749fe3a094f5525b639ef953";
+    sha256 = "0q3b2579ng01glfwan75zcyvkggixdz9c4i6cgid2664ad47zcvh";
   };
 
   sourceRoot = "astyle/build/gcc";
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 8df9f71c1816..d67407eb03df 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -8,7 +8,7 @@
 
 let
 
-  basename = "gdb-7.6.1";
+  basename = "gdb-7.6.2";
 
   # Whether (cross-)building for GNU/Hurd.  This is an approximation since
   # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}.tar.bz2";
-    md5 = "fbc4dab4181e6e9937075b43a4ce2732";
+    sha256 = "1s6hjqmq7xz10hqx45dgrpfh5mla578shn3zxgnrsv66w4n0wsig";
   };
 
   # I think python is not a native input, but I leave it
diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix
index dc7a467fb0c2..d0efe4e62494 100644
--- a/pkgs/development/tools/misc/gengetopt/default.nix
+++ b/pkgs/development/tools/misc/gengetopt/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "gengetopt-2.22.5";
+  name = "gengetopt-2.22.6";
 
   src = fetchurl {
     url = "mirror://gnu/gengetopt/${name}.tar.gz";
-    sha256 = "0dr1xmlgk9q8za17wnpgghb5ifnbca5vb0w5bc6fpc2j0cjb6vrv";
+    sha256 = "1xq1kcfs6hri101ss4dhym0jn96z4v6jdvx288mfywadc245mc1h";
   };
 
   doCheck = true;
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 91cf2be4f73b..d1cd59d8828a 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libtool, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "global-6.2.2";
+  name = "global-6.2.9";
 
   src = fetchurl {
     url = "mirror://gnu/global/${name}.tar.gz";
-    sha256 = "0a41d3wc22f05fqi5zpx1r22annsi4whdkjdmw50nidjca1vq5pj";
+    sha256 = "00y38kp0zbpjl9c9phldy7j2ihqc54qn4cdgk0azbjdsv75k3n6q";
   };
 
   buildInputs = [ libtool ncurses ];
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index edbc37e76a60..a3e1348f940d 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "help2man-1.40.8";
+  name = "help2man-1.43.3";
 
   src = fetchurl {
     url = "mirror://gnu/help2man/${name}.tar.gz";
-    sha256 = "0s6phazn8jgvpbsby8kj2m58rj1zjghi1aipvamh8af226ssqfzj";
+    sha256 = "00yk86rvvaavg7y6i5bvk5xhm417jl9dpr8bqvqdksw0i48qv5v7";
   };
 
   buildInputs = [ makeWrapper perl gettext LocaleGettext ];
diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index e603768b8cc2..00b32bed44e5 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "re2c-0.13.5";
+  name = "re2c-0.13.6";
   src = fetchurl {
-    url = mirror://sourceforge/re2c/re2c/0.13.5/re2c-0.13.5.tar.gz;
-    sha256 = "1336c54b3cacjxg3grxdraq6a00yidr04z90605fhxglk89rbagk";
+    url = mirror://sourceforge/re2c/re2c/0.13.6/re2c-0.13.6.tar.gz;
+    sha256 = "1h3na1zacw3166k6wkdjzjs67frjca9wj07wgfas56c7m8wk0ilf";
   };
 
   meta = {
diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix
index c00566977431..ee4644239298 100644
--- a/pkgs/development/tools/profiling/oprofile/default.nix
+++ b/pkgs/development/tools/profiling/oprofile/default.nix
@@ -6,11 +6,11 @@
 assert withGUI -> qt4 != null;
 
 stdenv.mkDerivation rec {
-  name = "oprofile-0.9.8";
+  name = "oprofile-0.9.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/oprofile/${name}.tar.gz";
-    sha256 = "1g31lwgpacql6w5z1z2f31pgwzn14rgsbh7kmmdmsgm2l47r0idb";
+    sha256 = "15vm24jhw4xfd55pfw1rlpzfsh4bl1vyjsajs78bi9xbv8038lhy";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
new file mode 100644
index 000000000000..80fc093822fd
--- /dev/null
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -0,0 +1,84 @@
+{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, rubyLibs, libiconv
+, libxml2, libxslt }:
+
+assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
+
+stdenv.mkDerivation rec {
+  name = "vagrant-1.4.0";
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url    = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.0_x86_64.deb;
+        sha256 = "0hggajqdwk1qlkhf5sgdlmyxhan33q3pdgks9n5i2cw6f2ckw3rh";
+      }
+    else
+      fetchurl {
+        url    = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.0_i686.deb;
+        sha256 = "03jcmsdl4na5n08phyvx65dnfv1gq9vgn07kcyqc2f8nq7vmcmkm";
+      };
+
+  meta = with stdenv.lib; {
+    description = "A tool for building complete development environments";
+    homepage    = http://vagrantup.com;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.linux;
+  };
+
+  unpackPhase = ''
+    ${dpkg}/bin/dpkg-deb -x ${src} .
+  '';
+
+  buildPhase = false;
+
+  installPhase = ''
+    sed -i "s|/opt|$out/opt|" usr/bin/vagrant
+
+    # overwrite embedded binaries
+
+    # curl: curl
+    rm opt/vagrant/embedded/bin/curl
+    ln -s ${curl}/bin/curl opt/vagrant/embedded/bin
+
+    # libarchive: bsdtar, bsdcpio
+    rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio}
+    ln -s ${libarchive}/bin/bsdtar opt/vagrant/embedded/bin
+    ln -s ${libarchive}/bin/bsdcpio opt/vagrant/embedded/bin
+
+    # openssl: c_rehash, openssl
+    rm opt/vagrant/embedded/bin/{c_rehash,openssl}
+    ln -s ${openssl}/bin/c_rehash opt/vagrant/embedded/bin
+    ln -s ${openssl}/bin/openssl opt/vagrant/embedded/bin
+
+    # ruby: erb, gem, irb, rake, rdoc, ri, ruby, testrb
+    rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby,testrb}
+    ln -s ${ruby}/bin/erb opt/vagrant/embedded/bin
+    ln -s ${ruby}/bin/gem opt/vagrant/embedded/bin
+    ln -s ${ruby}/bin/irb opt/vagrant/embedded/bin
+    ln -s ${rubyLibs.rake}/bin/rake opt/vagrant/embedded/bin
+    ln -s ${ruby}/bin/rdoc opt/vagrant/embedded/bin
+    ln -s ${ruby}/bin/ri opt/vagrant/embedded/bin
+    ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin
+    ln -s ${ruby}/bin/testrb opt/vagrant/embedded/bin
+
+    # libiconv: iconv
+    rm opt/vagrant/embedded/bin/iconv
+    ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin
+
+    # libxml: xml2-config, xmlcatalog, xmllint
+    rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint}
+    ln -s ${libxml2}/bin/xml2-config opt/vagrant/embedded/bin
+    ln -s ${libxml2}/bin/xmlcatalog opt/vagrant/embedded/bin
+    ln -s ${libxml2}/bin/xmllint opt/vagrant/embedded/bin
+
+    # libxslt: xslt-config, xsltproc
+    rm opt/vagrant/embedded/bin/{xslt-config,xsltproc}
+    ln -s ${libxslt}/bin/xslt-config opt/vagrant/embedded/bin
+    ln -s ${libxslt}/bin/xsltproc opt/vagrant/embedded/bin
+
+    mkdir -p "$out"
+    cp -r opt "$out"
+    cp -r usr/bin "$out"
+  '';
+}