Merge master into staging

pkgs/development/tools/analysis/flow/default.nix

@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, ocaml, libelf }:
 
 stdenv.mkDerivation rec {
-  version = "0.14.0";
+  version = "0.17.0";
   name = "flow-${version}";
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "02adbn2h5bfc4drcpbalq7acx573a657ik3008fr8s9qyqdp2nl6";
+    sha256 = "1hc4gspxp43svr36l4fn4fpd7d9myg8hf5hph5y1lq9ihqaiymsp";
   };
 
   installPhase = ''
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "A static type checker for JavaScript";
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
-    maintainers = with maintainers; [ puffnfresh ];
+    maintainers = with maintainers; [ puffnfresh globin ];
   };
 }

pkgs/development/tools/heroku/default.nix

@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  version = "3.32.0";
+  version = "3.42.20";
   name = "heroku-${version}";
 
   meta = {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
-    sha256 = "1596zmnlwshx15xiccfskm71syrlm87jf40y2x0y7wn0vfcyis5s";
+    sha256 = "1d472vm37lx5nyyaymjglavisb1mkyzbjglzjp5im7wjfifvsd29";
   };
 
   installPhase = ''

pkgs/development/tools/misc/complexity/default.nix

@@ -1,31 +1,18 @@
-{ fetchurl, stdenv, autogen, texinfo }:
+{ fetchurl, stdenv, autogen }:
 
 stdenv.mkDerivation rec {
-  # FIXME: Currently fails to build.
-  name = "complexity-0.4";
+  name = "complexity-${version}";
+  version = "1.3";
 
   src = fetchurl {
     url = "mirror://gnu/complexity/${name}.tar.gz";
-    sha256 = "0dmk2pm7vi95482hnbbp597640bsjw5gg57j8cpy87855cl69yr8";
+    sha256 = "19bc64sxpqd5rqylqaa7dijz2x7qp2b0dg3ah3fb3qbcvd8b4wgy";
   };
 
-  buildInputs =
-    [ autogen
-      texinfo  # XXX: shouldn't be needed, per GCS
-    ];
-
-  # Hack to work around build defect.
-  makeFlags = "MAKEINFOFLAGS=--no-validate";
+  buildInputs = [ autogen ];
 
   doCheck = true;
 
-  preBuild = ''
-    sed -i -e '/gets is a security/d' lib/stdio.in.h
-    sed -i '42 i\
-      #undef false\
-      #undef true' src/complexity.h
-  '';
-
   meta = {
     description = "C code complexity measurement tool";
 

pkgs/development/tools/misc/editorconfig-core-c/default.nix

@@ -0,0 +1,34 @@
+{ stdenv, fetchgit, cmake, pcre, doxygen }:
+
+stdenv.mkDerivation rec {
+
+  name = "editorconfig-core-c-${meta.version}";
+
+  src = fetchgit {
+    url = "https://github.com/editorconfig/editorconfig-core-c.git";
+    rev = "99d09270c58b817ea218979d513a90099ade6277";
+    fetchSubmodules = true;
+    sha256 = "0s35dzf2180205xq2xpfmmlfw112j3h87swnisza85qwwz8bf2k9";
+    inherit name;
+  };
+
+  buildInputs = [ cmake pcre doxygen ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://editorconfig.org/";
+    description = "EditorConfig core library written in C";
+    longDescription = ''
+      EditorConfig makes it easy to maintain the correct coding style when
+      switching between different text editors and between different
+      projects. The EditorConfig project maintains a file format and plugins
+      for various text editors which allow this file format to be read and used
+      by those editors. For information on the file format and supported text
+      editors, see the EditorConfig website.
+    '';
+    downloadPage = "https://github.com/editorconfig/editorconfig-core-c";
+    license = with licenses; [ bsd2 bsd3 ];
+    version = "0.12.0";
+    maintainers = [ maintainers.dochang ];
+  };
+
+}

pkgs/development/tools/rtags/default.nix

@@ -0,0 +1,37 @@
+{ stdenv, fetchgit, cmake, llvm, openssl, clang, writeScript, bash }:
+
+let llvm-config-wrapper = writeScript "llvm-config" ''
+      #! ${bash}/bin/bash
+      if [[ "$1" = "--cxxflags" ]]; then
+        echo $(${llvm}/bin/llvm-config "$@") -isystem ${clang.cc}/include
+      else
+        ${llvm}/bin/llvm-config "$@"
+      fi
+    '';
+
+in stdenv.mkDerivation rec {
+  name = "rtags-${version}";
+  rev = "9fed420d20935faf55770765591fc2de02eeee28";
+  version = "${stdenv.lib.strings.substring 0 7 rev}";
+
+  buildInputs = [ cmake llvm openssl clang ];
+
+  preConfigure = ''
+    export LIBCLANG_LLVM_CONFIG_EXECUTABLE=${llvm-config-wrapper}
+  '';
+
+  src = fetchgit {
+    inherit rev;
+    fetchSubmodules = true;
+    url = "https://github.com/andersbakken/rtags.git";
+    sha256 = "1sb6wfknhvrgirqp65paz7kihv4zgg8g5f7a7i14i10sysalxbif";
+  };
+
+  meta = {
+    description = "C/C++ client-server indexer based on clang";
+
+    homepage = https://github.com/andersbakken/rtags;
+
+    license = stdenv.lib.licenses.gpl3;
+  };
+}

pkgs/development/tools/rust/rustfmt/default.nix

@@ -1,18 +1,17 @@
-{ stdenv, fetchgit, rustUnstable, makeWrapper, llvmPackages_37 }:
+{ stdenv, fetchFromGitHub, rustUnstable, makeWrapper }:
 
 with rustUnstable;
 
 buildRustPackage rec {
-  name = "rustfmt-git-2015-09-23";
-  src = fetchgit {
-    url = https://github.com/nrc/rustfmt;
-    rev = "c14cfca0e3de3dfa5fd91d39a85c5b452e7756e3";
-    sha256 = "0q72mfj2ph2n4cd0cs4p2mpyr2ixd6ss607kjlgfinjv6klk1i3b";
+  name = "rustfmt-git-2015-10-17";
+  src = fetchFromGitHub {
+    owner = "nrc";
+    repo = "rustfmt";
+    rev = "36c9a3acf95a036f3f9fa72ff3fe175fba55e20b";
+    sha256 = "1vjnfq3al73qljalr2rvymabcksx6y690gg5r9kgz1lnizlb7yrz";
   };
 
-  buildInputs = [ llvmPackages_37.llvm ];
-
-  depsSha256 = "13i9qaia1wn18lgfl69rrxw7b24bq1bpqhdck2jzxpv3wi2xshlw";
+  depsSha256 = "0vzpq58vfswdwdm2bk44ynk43cmwdxppcbkvpjyfa6sjs2s5x8n9";
 
   meta = with stdenv.lib; {
     description = "A tool for formatting Rust code according to style guidelines";