Merge branch 'master' into closure-size

13 files changed, 508 insertions, 119 deletions

diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix
index d93c64a15a9c..4a33a0cd8f33 100644
--- a/pkgs/development/tools/analysis/kcov/default.nix
+++ b/pkgs/development/tools/analysis/kcov/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, pkgconfig, libelf, zlib, curl, elfutils, python, libiberty, binutils}:
+{stdenv, fetchurl, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, binutils}:
 stdenv.mkDerivation rec {
   name = "kcov-${version}";
   version = "29";
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0nspf1bfq8zv7zmcmvkbgg3c90k10qcd56gyg8ln5z64nadvha9d";
   };
 
-  buildInputs = [ cmake pkgconfig libelf zlib curl elfutils python libiberty binutils ];
+  preConfigure = "patchShebangs src/bin-to-c-source.py";
+  buildInputs = [ cmake pkgconfig zlib curl elfutils python libiberty binutils ];
   
   meta = with stdenv.lib; {
     description = "code coverage tester for compiled programs, Python scripts and shell scripts";
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 70a6fac7bab3..f4f18dac487c 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -3,18 +3,18 @@
 
 stdenv.mkDerivation rec {
   pname = "leiningen";
-  version = "2.5.2";
+  version = "2.5.3";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
-    sha256 = "0pzs645315nvn981w3nj8fi30g6kq67cmj7hq7da658qlk0p6r7i";
+    sha256 = "0xbfg6v6f3qyi99dbqragh3za2a0agrcq9c0qbkshvp5yd0fx4h1";
   };
 
   jarsrc = fetchurl {
     # NOTE: This is actually a .jar, Github has issues
     url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip";
-    sha256 = "0qhvgvii4x3p49bx494f6fc7dfvxx2crp2wbkldxx2brvh105iv4";
+    sha256 = "1p93j03v02mf1cnli6lv9qqnx7gwxr571g8z7y06p0d4nq31c32b";
   };
 
   patches = [ ./lein-fix-jar-path.patch ];
diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock
index 60ff7b5ba3e4..28b0e7f8aa43 100644
--- a/pkgs/development/tools/chefdk/Gemfile.lock
+++ b/pkgs/development/tools/chefdk/Gemfile.lock
@@ -1,95 +1,173 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    chef (12.0.3)
-      chef-zero (~> 3.2)
+    builder (3.2.2)
+    chef (12.5.1)
+      chef-config (= 12.5.1)
+      chef-zero (~> 4.2, >= 4.2.2)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
-      ffi-yajl (~> 1.2)
+      ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
       mixlib-authentication (~> 1.3)
       mixlib-cli (~> 1.4)
-      mixlib-config (~> 2.0)
       mixlib-log (~> 1.3)
-      mixlib-shellout (>= 2.0.0.rc.0, < 3.0)
+      mixlib-shellout (~> 2.0)
       net-ssh (~> 2.6)
       net-ssh-multi (~> 1.1)
-      ohai (~> 8.0)
+      ohai (>= 8.6.0.alpha.1, < 9)
       plist (~> 3.1.0)
       pry (~> 0.9)
-    chef-dk (0.4.0)
-      chef (~> 12.0)
-      cookbook-omnifetch (~> 0.2)
-      ffi-yajl (~> 1.0)
+      rspec-core (~> 3.2)
+      rspec-expectations (~> 3.2)
+      rspec-mocks (~> 3.2)
+      rspec_junit_formatter (~> 0.2.0)
+      serverspec (~> 2.7)
+      specinfra (~> 2.10)
+      syslog-logger (~> 1.6)
+    chef-config (12.5.1)
+      mixlib-config (~> 2.0)
+      mixlib-shellout (~> 2.0)
+    chef-dk (0.10.0)
+      chef (~> 12.0, >= 12.2.1)
+      chef-provisioning (~> 1.2)
+      cookbook-omnifetch (~> 0.2, >= 0.2.2)
+      diff-lcs (~> 1.0)
+      ffi-yajl (>= 1.0, < 3.0)
+      minitar (~> 0.5.4)
       mixlib-cli (~> 1.5)
-      mixlib-shellout (>= 2.0.0.rc.0, < 3.0.0)
-      solve (~> 1.2)
-    chef-zero (3.2.1)
-      ffi-yajl (~> 1.1)
-      hashie (~> 2.0)
+      mixlib-shellout (~> 2.0)
+      paint (~> 1.0)
+      solve (~> 2.0, >= 2.0.1)
+    chef-provisioning (1.5.0)
+      cheffish (~> 1.3, >= 1.3.1)
+      inifile (~> 2.0)
+      mixlib-install (~> 0.7.0)
+      net-scp (~> 1.0)
+      net-ssh (~> 2.0)
+      net-ssh-gateway (~> 1.2.0)
+      winrm (~> 1.3)
+    chef-zero (4.3.2)
+      ffi-yajl (~> 2.2)
+      hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
       rack
       uuidtools (~> 2.1)
+    cheffish (1.6.0)
+      chef-zero (~> 4.3)
     coderay (1.1.0)
-    cookbook-omnifetch (0.2.0)
+    cookbook-omnifetch (0.2.2)
       minitar (~> 0.5.4)
-    dep-selector-libgecode (1.0.2)
-    dep_selector (1.0.3)
-      dep-selector-libgecode (~> 1.0)
-      ffi (~> 1.9)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    ffi (1.9.6)
-    ffi-yajl (1.4.0)
-      ffi (~> 1.5)
+    ffi (1.9.10)
+    ffi-yajl (2.2.2)
       libyajl2 (~> 1.2)
-    hashie (2.1.2)
-    highline (1.7.1)
+    gssapi (1.2.0)
+      ffi (>= 1.0.1)
+    gyoku (1.3.1)
+      builder (>= 2.1.2)
+    hashie (3.4.3)
+    highline (1.7.8)
+    httpclient (2.7.0.1)
+    inifile (2.0.2)
     ipaddress (0.8.0)
     libyajl2 (1.2.0)
+    little-plugger (1.1.4)
+    logging (2.0.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
     method_source (0.8.2)
-    mime-types (2.4.3)
+    mime-types (2.99)
     minitar (0.5.4)
     mixlib-authentication (1.3.0)
       mixlib-log
     mixlib-cli (1.5.0)
-    mixlib-config (2.1.0)
+    mixlib-config (2.2.1)
+    mixlib-install (0.7.0)
     mixlib-log (1.6.0)
-    mixlib-shellout (2.0.1)
-    net-dhcp (1.3.2)
+    mixlib-shellout (2.2.5)
+    molinillo (0.2.3)
+    multi_json (1.11.2)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    net-ssh-multi (1.2.0)
+    net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    ohai (8.1.1)
+    net-telnet (0.1.1)
+    nori (2.6.0)
+    ohai (8.7.0)
+      chef-config (>= 12.5.0.alpha.1, < 13)
       ffi (~> 1.9)
-      ffi-yajl (~> 1.1)
+      ffi-yajl (~> 2.2)
       ipaddress
       mime-types (~> 2.0)
       mixlib-cli
       mixlib-config (~> 2.0)
       mixlib-log
       mixlib-shellout (~> 2.0)
-      net-dhcp
       rake (~> 10.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
+    paint (1.0.0)
     plist (3.1.0)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.0)
+    rack (1.6.4)
     rake (10.4.2)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rspec_junit_formatter (0.2.3)
+      builder (< 4)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubyntlm (0.4.0)
     semverse (1.2.1)
+    serverspec (2.24.3)
+      multi_json
+      rspec (~> 3.0)
+      rspec-its
+      specinfra (~> 2.43)
+    sfl (2.2)
     slop (3.6.0)
-    solve (1.2.1)
-      dep_selector (~> 1.0)
+    solve (2.0.1)
+      molinillo (~> 0.2.3)
       semverse (~> 1.1)
-    systemu (2.6.4)
+    specinfra (2.44.5)
+      net-scp
+      net-ssh (~> 2.7)
+      net-telnet
+      sfl
+    syslog-logger (1.6.8)
+    systemu (2.6.5)
     uuidtools (2.1.5)
+    winrm (1.3.6)
+      builder (>= 2.1.2)
+      gssapi (~> 1.2)
+      gyoku (~> 1.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (>= 1.6.1, < 3.0)
+      nori (~> 2.0)
+      rubyntlm (~> 0.4.0)
+      uuidtools (~> 2.1.2)
     wmi-lite (1.0.0)
 
 PLATFORMS
@@ -97,3 +175,6 @@ PLATFORMS
 
 DEPENDENCIES
   chef-dk
+
+BUNDLED WITH
+   1.10.5
diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix
index 043ee8adf421..3b427aae4d25 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, bundlerEnv, ruby, perl, autoconf }:
 
 bundlerEnv {
-  name = "chefdk-0.4.0";
+  name = "chefdk-0.10.0";
 
   inherit ruby;
   gemfile = ./Gemfile;
diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix
index f83e73693d89..cb4c1fcb67d6 100644
--- a/pkgs/development/tools/chefdk/gemset.nix
+++ b/pkgs/development/tools/chefdk/gemset.nix
@@ -1,11 +1,19 @@
 {
+  "builder" = {
+    version = "3.2.2";
+    source = {
+      type = "gem";
+      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
+    };
+  };
   "chef" = {
-    version = "12.0.3";
+    version = "12.5.1";
     source = {
       type = "gem";
-      sha256 = "0lqix0mli6fm3lwrf563sjvfkfsrnyzbz8xqkp54q65dkl63ldy0";
+      sha256 = "0hf6766wmh1dg7f09hi80s8hn1knvzgnaimbhvc05b4q973k5lmb";
     };
     dependencies = [
+      "chef-config"
       "chef-zero"
       "diff-lcs"
       "erubis"
@@ -13,7 +21,6 @@
       "highline"
       "mixlib-authentication"
       "mixlib-cli"
-      "mixlib-config"
       "mixlib-log"
       "mixlib-shellout"
       "net-ssh"
@@ -21,28 +28,66 @@
       "ohai"
       "plist"
       "pry"
+      "rspec-core"
+      "rspec-expectations"
+      "rspec-mocks"
+      "rspec_junit_formatter"
+      "serverspec"
+      "specinfra"
+      "syslog-logger"
+    ];
+  };
+  "chef-config" = {
+    version = "12.5.1";
+    source = {
+      type = "gem";
+      sha256 = "18iqlf9x3iavh6183zlkiasxsz45drshihmk8yj56prrzfiys67m";
+    };
+    dependencies = [
+      "mixlib-config"
+      "mixlib-shellout"
     ];
   };
   "chef-dk" = {
-    version = "0.4.0";
+    version = "0.10.0";
     source = {
       type = "gem";
-      sha256 = "12fdk5j6cymwk4vk45mvi5i1hs9a88jvg6g7x6pxbc0bp3if2c6a";
+      sha256 = "0gxm8dbq7y4bf9wb8zad9q5idsl88f1nm3rvnd2am0xka6bnxv29";
     };
     dependencies = [
       "chef"
+      "chef-provisioning"
       "cookbook-omnifetch"
+      "diff-lcs"
       "ffi-yajl"
+      "minitar"
       "mixlib-cli"
       "mixlib-shellout"
+      "paint"
       "solve"
     ];
   };
+  "chef-provisioning" = {
+    version = "1.5.0";
+    source = {
+      type = "gem";
+      sha256 = "1xln9hf8mcm81cmw96ccmyzrak54fbjrl9wgii37rx04v4a2435n";
+    };
+    dependencies = [
+      "cheffish"
+      "inifile"
+      "mixlib-install"
+      "net-scp"
+      "net-ssh"
+      "net-ssh-gateway"
+      "winrm"
+    ];
+  };
   "chef-zero" = {
-    version = "3.2.1";
+    version = "4.3.2";
     source = {
       type = "gem";
-      sha256 = "04zypmygpxz8nwhjs4gvr8rcb9vqhmz37clbh7k7xxh5b2hs654k";
+      sha256 = "1djnxs97kj13vj1hxx4v6978pkwm8i03p76gbirbp3z2zs6jyvjf";
     };
     dependencies = [
       "ffi-yajl"
@@ -52,39 +97,31 @@
       "uuidtools"
     ];
   };
-  "coderay" = {
-    version = "1.1.0";
-    source = {
-      type = "gem";
-      sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s";
-    };
-  };
-  "cookbook-omnifetch" = {
-    version = "0.2.0";
+  "cheffish" = {
+    version = "1.6.0";
     source = {
       type = "gem";
-      sha256 = "027zz78693jd5g0fwp0xlzig2zijsxcgvfw5854ig37gy5a54wy4";
+      sha256 = "10aj660azybnf7444a604pjs8p9pvwm3n4mavy8mp3g30yr07paq";
     };
     dependencies = [
-      "minitar"
+      "chef-zero"
     ];
   };
-  "dep-selector-libgecode" = {
-    version = "1.0.2";
+  "coderay" = {
+    version = "1.1.0";
     source = {
       type = "gem";
-      sha256 = "0755ps446wc4cf26ggmvibr4wmap6ch7zhkh1qmx1p6lic2hr4gn";
+      sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s";
     };
   };
-  "dep_selector" = {
-    version = "1.0.3";
+  "cookbook-omnifetch" = {
+    version = "0.2.2";
     source = {
       type = "gem";
-      sha256 = "1ic90j3d6hmyxmdxzdz8crwmvw61f4kj0jphk43m6ipcx6bkphzw";
+      sha256 = "1ml25xc69nsgbvp9a6w9yi376rav7b659cvyr8qhfb4jaj4l1yd6";
     };
     dependencies = [
-      "dep-selector-libgecode"
-      "ffi"
+      "minitar"
     ];
   };
   "diff-lcs" = {
@@ -102,35 +139,68 @@
     };
   };
   "ffi" = {
-    version = "1.9.6";
+    version = "1.9.10";
     source = {
       type = "gem";
-      sha256 = "1ckw1336rnyv9yvvl614qgkqqi477g4hljv6xsws2vz14ynlvzhj";
+      sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
     };
   };
   "ffi-yajl" = {
-    version = "1.4.0";
+    version = "2.2.2";
     source = {
       type = "gem";
-      sha256 = "1l289wyzc06v0rn73msqxx4gm48iqgxkd9rins22f13qicpczi5g";
+      sha256 = "013n5cf80p2wfpmj1mdjkbmcyx3hg4c81wl3bamglaf4i12a2qk2";
     };
     dependencies = [
-      "ffi"
       "libyajl2"
     ];
   };
+  "gssapi" = {
+    version = "1.2.0";
+    source = {
+      type = "gem";
+      sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix";
+    };
+    dependencies = [
+      "ffi"
+    ];
+  };
+  "gyoku" = {
+    version = "1.3.1";
+    source = {
+      type = "gem";
+      sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh";
+    };
+    dependencies = [
+      "builder"
+    ];
+  };
   "hashie" = {
-    version = "2.1.2";
+    version = "3.4.3";
     source = {
       type = "gem";
-      sha256 = "08w9ask37zh5w989b6igair3zf8gwllyzix97rlabxglif9f9qd9";
+      sha256 = "1iv5hd0zcryprx9lbcm615r3afc0d6rhc27clywmhhgpx68k8899";
     };
   };
   "highline" = {
-    version = "1.7.1";
+    version = "1.7.8";
     source = {
       type = "gem";
-      sha256 = "1355zfwmm6baq44rp0ny7zdnsipgn5maxk19hvii0jx2bsk417fr";
+      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+    };
+  };
+  "httpclient" = {
+    version = "2.7.0.1";
+    source = {
+      type = "gem";
+      sha256 = "0k6bqsaqq6c824vrbfb5pkz8bpk565zikd10w85rzj2dy809ik6c";
+    };
+  };
+  "inifile" = {
+    version = "2.0.2";
+    source = {
+      type = "gem";
+      sha256 = "03rpacxnrnisjhd2zhc7629ica958bkdbakicl5kipw1wbprck25";
     };
   };
   "ipaddress" = {
@@ -147,6 +217,24 @@
       sha256 = "0n5j0p8dxf9xzb9n4bkdr8w0a8gg3jzrn9indri3n0fv90gcs5qi";
     };
   };
+  "little-plugger" = {
+    version = "1.1.4";
+    source = {
+      type = "gem";
+      sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
+    };
+  };
+  "logging" = {
+    version = "2.0.0";
+    source = {
+      type = "gem";
+      sha256 = "0ka5q88qvc2w7yr9z338jwxcyj1kifmbr9is5hps2f37asismqvb";
+    };
+    dependencies = [
+      "little-plugger"
+      "multi_json"
+    ];
+  };
   "method_source" = {
     version = "0.8.2";
     source = {
@@ -155,10 +243,10 @@
     };
   };
   "mime-types" = {
-    version = "2.4.3";
+    version = "2.99";
     source = {
       type = "gem";
-      sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq";
+      sha256 = "1hravghdnk9qbibxb3ggzv7mysl97djh8n0rsswy3ssjaw7cbvf2";
     };
   };
   "minitar" = {
@@ -186,10 +274,17 @@
     };
   };
   "mixlib-config" = {
-    version = "2.1.0";
+    version = "2.2.1";
+    source = {
+      type = "gem";
+      sha256 = "0smhnyhw1va94vrd7zapxplbavbs4dc78h9yd1yfv52fzxx16zk3";
+    };
+  };
+  "mixlib-install" = {
+    version = "0.7.0";
     source = {
       type = "gem";
-      sha256 = "13mb628614nl4dfwyyqpxc7b688ls6cfnjx06j8c13sl003xkp7g";
+      sha256 = "0ll1p7v7fp3rf11dz8pifz33jhl4bdg779n4hzlnbia2z7xfsa2w";
     };
   };
   "mixlib-log" = {
@@ -200,19 +295,36 @@
     };
   };
   "mixlib-shellout" = {
-    version = "2.0.1";
+    version = "2.2.5";
     source = {
       type = "gem";
-      sha256 = "16n2zli15504bfzxwj5riq92zz3h8n8xswvs5gi0dp2dhyjd7lp3";
+      sha256 = "1is07rar0x8n9h67j4iyrxz2yfgis4bnhh3x7vhbbi6khqqixg79";
     };
   };
-  "net-dhcp" = {
-    version = "1.3.2";
+  "molinillo" = {
+    version = "0.2.3";
     source = {
       type = "gem";
-      sha256 = "13mq3kwk6k3cd0vhnj1xq0gvbg2hbynzpnvq6fa6vqakbyc0iznd";
+      sha256 = "1ylvnpdn20nna488mkzpq3iy6gr866gmkiv090c7g5h88x1qws0b";
     };
   };
+  "multi_json" = {
+    version = "1.11.2";
+    source = {
+      type = "gem";
+      sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r";
+    };
+  };
+  "net-scp" = {
+    version = "1.2.1";
+    source = {
+      type = "gem";
+      sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
+    };
+    dependencies = [
+      "net-ssh"
+    ];
+  };
   "net-ssh" = {
     version = "2.9.2";
     source = {
@@ -231,23 +343,38 @@
     ];
   };
   "net-ssh-multi" = {
-    version = "1.2.0";
+    version = "1.2.1";
     source = {
       type = "gem";
-      sha256 = "0927244ac8h3z6wl5cifkblsa95ddpsxr6k8h2fmdvg5wdqs4ydh";
+      sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71";
     };
     dependencies = [
       "net-ssh"
       "net-ssh-gateway"
     ];
   };
+  "net-telnet" = {
+    version = "0.1.1";
+    source = {
+      type = "gem";
+      sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx";
+    };
+  };
+  "nori" = {
+    version = "2.6.0";
+    source = {
+      type = "gem";
+      sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn";
+    };
+  };
   "ohai" = {
-    version = "8.1.1";
+    version = "8.7.0";
     source = {
       type = "gem";
-      sha256 = "1lcbl7lrmy56x6l6ca7miawj9h40ff6nv4b3n6bz3w7fa3vh9xz0";
+      sha256 = "1f10kgxh89iwij54yx8q11n1q87653ckvdmdwg8cwz3qlgf4flhy";
     };
     dependencies = [
+      "chef-config"
       "ffi"
       "ffi-yajl"
       "ipaddress"
@@ -256,12 +383,18 @@
       "mixlib-config"
       "mixlib-log"
       "mixlib-shellout"
-      "net-dhcp"
       "rake"
       "systemu"
       "wmi-lite"
     ];
   };
+  "paint" = {
+    version = "1.0.0";
+    source = {
+      type = "gem";
+      sha256 = "0mhwj6w60q40w4f6jz8xx8bv1kghjvsjc3d8q8pnslax4fkmzbp1";
+    };
+  };
   "plist" = {
     version = "3.1.0";
     source = {
@@ -270,10 +403,10 @@
     };
   };
   "pry" = {
-    version = "0.10.1";
+    version = "0.10.3";
     source = {
       type = "gem";
-      sha256 = "1j0r5fm0wvdwzbh6d6apnp7c0n150hpm9zxpm5xvcgfqr36jaj8z";
+      sha256 = "1x78rvp69ws37kwig18a8hr79qn36vh8g1fn75p485y3b3yiqszg";
     };
     dependencies = [
       "coderay"
@@ -282,10 +415,10 @@
     ];
   };
   "rack" = {
-    version = "1.6.0";
+    version = "1.6.4";
     source = {
       type = "gem";
-      sha256 = "1f57f8xmrgfgd76s6mq7vx6i266zm4330igw71an1g0kh3a42sbb";
+      sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
     };
   };
   "rake" = {
@@ -295,6 +428,86 @@
       sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8";
     };
   };
+  "rspec" = {
+    version = "3.4.0";
+    source = {
+      type = "gem";
+      sha256 = "12axhz2nj2m0dy350lxym76m36m1hq48hc59mf00z9dajbpnj78s";
+    };
+    dependencies = [
+      "rspec-core"
+      "rspec-expectations"
+      "rspec-mocks"
+    ];
+  };
+  "rspec-core" = {
+    version = "3.4.1";
+    source = {
+      type = "gem";
+      sha256 = "0zl4fbrzl4gg2bn3fhv910q04sm2jvzdidmvd71gdgqwbzk0zngn";
+    };
+    dependencies = [
+      "rspec-support"
+    ];
+  };
+  "rspec-expectations" = {
+    version = "3.4.0";
+    source = {
+      type = "gem";
+      sha256 = "07pz570glwg87zpyagxxal0daa1jrnjkiksnn410s6846884fk8h";
+    };
+    dependencies = [
+      "diff-lcs"
+      "rspec-support"
+    ];
+  };
+  "rspec-its" = {
+    version = "1.2.0";
+    source = {
+      type = "gem";
+      sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3";
+    };
+    dependencies = [
+      "rspec-core"
+      "rspec-expectations"
+    ];
+  };
+  "rspec-mocks" = {
+    version = "3.4.0";
+    source = {
+      type = "gem";
+      sha256 = "0iw9qvpawj3cfcg3xipi1v4y11g9q4f5lvmzgksn6f0chf97sjy1";
+    };
+    dependencies = [
+      "diff-lcs"
+      "rspec-support"
+    ];
+  };
+  "rspec-support" = {
+    version = "3.4.1";
+    source = {
+      type = "gem";
+      sha256 = "0l6zzlf22hn3pcwnxswsjsiwhqjg7a8mhvm680k5vq98307bkikr";
+    };
+  };
+  "rspec_junit_formatter" = {
+    version = "0.2.3";
+    source = {
+      type = "gem";
+      sha256 = "0hphl8iggqh1mpbbv0avf8735x6jgry5wmkqyzgv1zwnimvja1ai";
+    };
+    dependencies = [
+      "builder"
+      "rspec-core"
+    ];
+  };
+  "rubyntlm" = {
+    version = "0.4.0";
+    source = {
+      type = "gem";
+      sha256 = "03xmi8mxcbc5laad10r6b705dk4vyhl9lr7h940f2rhibymxq45x";
+    };
+  };
   "semverse" = {
     version = "1.2.1";
     source = {
@@ -302,6 +515,26 @@
       sha256 = "0s47lprqwmlhnxm3anrhvd3559g51hgrcqn3mq0fy696zkv8vfd8";
     };
   };
+  "serverspec" = {
+    version = "2.24.3";
+    source = {
+      type = "gem";
+      sha256 = "03v6qqshqjsvbbjf1pwbi2mzgqg84wdbhnqb3gdbl1m9bz7sxg1n";
+    };
+    dependencies = [
+      "multi_json"
+      "rspec"
+      "rspec-its"
+      "specinfra"
+    ];
+  };
+  "sfl" = {
+    version = "2.2";
+    source = {
+      type = "gem";
+      sha256 = "0aq7ykbyvx8mx4szkcgp09zs094fg60l2pzxscmxqrgqk9yvyg1j";
+    };
+  };
   "slop" = {
     version = "3.6.0";
     source = {
@@ -310,21 +543,41 @@
     };
   };
   "solve" = {
-    version = "1.2.1";
+    version = "2.0.1";
     source = {
       type = "gem";
-      sha256 = "0ff5iwhsr6fcp10gd2ivrx1fcw3lm5f5f11srhy2z5dc3v79mcja";
+      sha256 = "0009xvg40y59bijds5njnwfshfw68wmj54yz3qy538g9rpxvmqp1";
     };
     dependencies = [
-      "dep_selector"
+      "molinillo"
       "semverse"
     ];
   };
+  "specinfra" = {
+    version = "2.44.5";
+    source = {
+      type = "gem";
+      sha256 = "018i3bmmy7lc21hagvwfmz2sdfj0v87a7yy3z162lcpq62vxw89r";
+    };
+    dependencies = [
+      "net-scp"
+      "net-ssh"
+      "net-telnet"
+      "sfl"
+    ];
+  };
+  "syslog-logger" = {
+    version = "1.6.8";
+    source = {
+      type = "gem";
+      sha256 = "14y20phq1khdla4z9wvf98k7j3x6n0rjgs4f7vb0xlf7h53g6hbm";
+    };
+  };
   "systemu" = {
-    version = "2.6.4";
+    version = "2.6.5";
     source = {
       type = "gem";
-      sha256 = "16k94azpsy1r958r6ysk4ksnpp54rqmh5hyamad9kwc3lk83i32z";
+      sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1";
     };
   };
   "uuidtools" = {
@@ -334,6 +587,23 @@
       sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g";
     };
   };
+  "winrm" = {
+    version = "1.3.6";
+    source = {
+      type = "gem";
+      sha256 = "1rx42y5w9d3w6axxwdj9zckzsgsjk172zxn52w2jj65spl98vxbc";
+    };
+    dependencies = [
+      "builder"
+      "gssapi"
+      "gyoku"
+      "httpclient"
+      "logging"
+      "nori"
+      "rubyntlm"
+      "uuidtools"
+    ];
+  };
   "wmi-lite" = {
     version = "1.0.0";
     source = {
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 78669dfdce7a..82bbab5ff87e 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -20,12 +20,14 @@ stdenv.mkDerivation {
   buildInputs =
     [ perl python flex bison ]
     ++ stdenv.lib.optional (qt4 != null) qt4
+    ++ stdenv.lib.optional stdenv.isSunOS libiconv
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
 
   prefixKey = "--prefix ";
 
   configureFlags =
     [ "--dot dot" ]
+    ++ stdenv.lib.optional stdenv.isSunOS "--install install"
     ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard";
 
   preConfigure =
diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
new file mode 100644
index 000000000000..a8fa950c98d8
--- /dev/null
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, ghc, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "multi-ghc-travis-${version}";
+  version = "git-2015-11-04";
+
+  buildInputs = [ ghc ];
+
+  src = fetchFromGitHub {
+    owner = "hvr";
+    repo = "multi-ghc-travis";
+    rev = "4c288937ff8b80f6f1532609f9920912856dc3ee";
+    sha256 = "0978k81by403in7iq7ia4hsfwlvaalnjqyh3ihwyw8822a5gm8y9";
+  };
+
+  patchPhase = ''
+    substituteInPlace make_travis_yml.hs --replace "make_travis_yml.hs" "multi-ghc-travis"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    ghc -O --make make_travis_yml.hs -o $out/bin/multi-ghc-travis
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Generate .travis.yml for multiple ghc versions";
+    homepage = "https://github.com/hvr/multi-ghc-travis";
+    license = licenses.free;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jb55 ];
+  };
+}
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 4386e7eaf741..8f687908017f 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.47.2";
+  name = "help2man-1.47.3";
 
   src = fetchurl {
     url = "mirror://gnu/help2man/${name}.tar.xz";
-    sha256 = "0z1zgw6k1fba59fii6ksfi1g2gci6i4ysa3kdfh3j475fdkn1if4";
+    sha256 = "0miqq77ssk5rgsc9xlv7k5n2wk2c5wv2m1kh4zhbwrggfmjaycn2";
   };
 
   buildInputs = [ makeWrapper perl gettext LocaleGettext ];
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 127223c4ee15..c98bddf53c09 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
   patches = optional (!vanilla) ./requires-private.patch
     ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch;
 
-  buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin) libiconv;
-
   preConfigure = stdenv.lib.optionalString (stdenv.system == "mips64el-linux")
     ''cp -v ${automake}/share/automake*/config.{sub,guess} .'';
+  buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;
 
-  configureFlags = [ "--with-internal-glib" ];
+  configureFlags = [ "--with-internal-glib" ]
+    ++ stdenv.lib.optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ];
 
   postInstall = ''rm "$out"/bin/*-pkg-config''; # clean the duplicate file
 
diff --git a/pkgs/development/tools/misc/texinfo/6.0.nix b/pkgs/development/tools/misc/texinfo/6.0.nix
index 5099676f32ba..11e822291e8d 100644
--- a/pkgs/development/tools/misc/texinfo/6.0.nix
+++ b/pkgs/development/tools/misc/texinfo/6.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }:
+{ stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, interactive ? false }:
 
 stdenv.mkDerivation rec {
   name = "texinfo-6.0";
@@ -9,14 +9,17 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ perl xz ]
+    ++ stdenv.lib.optionals stdenv.isSunOS [ libiconv gawk ]
     ++ stdenv.lib.optional interactive ncurses;
 
+  configureFlags = stdenv.lib.optionalString stdenv.isSunOS "AWK=${gawk}/bin/awk";
+
   preInstall = ''
     installFlags="TEXMF=$out/texmf-dist";
     installTargets="install install-tex";
   '';
 
-  doCheck = !stdenv.isDarwin && !interactive;
+  doCheck = !stdenv.isDarwin && !interactive && !stdenv.isSunOS/*flaky*/;
 
   meta = {
     homepage = "http://www.gnu.org/software/texinfo/";
diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index b38751ba99e4..ee0074140178 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl }:
+{ stdenv, fetchurl, m4, perl, help2man }:
 
 stdenv.mkDerivation rec {
   name = "bison-3.0.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "b67fd2daae7a64b5ba862c66c07c1addb9e6b1b05c5f2049392cfd8a2172952e";
   };
 
-  nativeBuildInputs = [ m4 perl ];
+  nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;
   propagatedBuildInputs = [ m4 ];
 
   meta = {
diff --git a/pkgs/development/tools/parsing/flex/2.5.39.nix b/pkgs/development/tools/parsing/flex/default.nix
index 93d54803e7c7..57ce29f51753 100644
--- a/pkgs/development/tools/parsing/flex/2.5.39.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bison, m4 }:
 
-stdenv.mkDerivation {
-  name = "flex-2.5.39";
+stdenv.mkDerivation rec {
+  name = "flex-2.6.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/flex/flex-2.5.39.tar.bz2;
-    sha256 = "0zv15giw3gma03y2bzw78hjfy49vyir7vbcgnh9bb3637dgvblmd";
+    url = "mirror://sourceforge/flex/${name}.tar.bz2";
+    sha256 = "1sdqx63yadindzafrq1w31ajblf9gl1c301g068s20s7bbpi3ri4";
   };
 
   buildInputs = [ bison ];
diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
index 876734a3e113..49a87754e72e 100644
--- a/pkgs/development/tools/rust/rustfmt/default.nix
+++ b/pkgs/development/tools/rust/rustfmt/default.nix
@@ -3,15 +3,15 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "rustfmt-git-2015-10-28";
+  name = "rustfmt-git-2015-12-08";
   src = fetchFromGitHub {
     owner = "nrc";
     repo = "rustfmt";
-    rev = "bd0fdbb364ba69c69b867f96bc1ea9b59177fb76";
-    sha256 = "07yxz409yxgwrzm46fhq6kyn9igznb7481kxyk90ngmhdd0a5mfd";
+    rev = "e94bd34a06d878a41bb8be409f173a8824dda63f";
+    sha256 = "0f0ixbr5nfla0j0b91plmapw75yl3d3lxwvllj2wx4z94nfxanp6";
   };
 
-  depsSha256 = "0qs6ilpvcrvcmxg7a94rbg9rql1hxfljy6gxrvpn59dy8hb1qccb";
+  depsSha256 = "0vsrpw4icn9jf44sqr5749hbazsxp3hqn1g7gr90fvnfvz4s5f07";
 
   meta = with stdenv.lib; {
     description = "A tool for formatting Rust code according to style guidelines";