Merge branch 'master' into staging

pkgs/development/tools/build-managers/meson/default.nix

@@ -1,13 +1,23 @@
-{ lib, python3Packages, fetchurl }:
-python3Packages.buildPythonPackage rec {
-  version = "0.35.0";
-  name = "meson-${version}";
+{ lib, python3Packages }:
+python3Packages.buildPythonApplication rec {
+  version = "0.40.0";
+  pname = "meson";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/m/meson/${name}.tar.gz";
-    sha256 = "0w4vian55cwcv2m5qzn73aznf9a0y24cszqb7dkpahrb9yrg25l3";
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "1hb6y5phzd5738rlpz78w8hfzk7sbxj81551mb7bbkkqz8ql1gjw";
   };
 
+  postFixup = ''
+    pushd $out/bin
+    # undo shell wrapper as meson tools are called with python
+    for i in *; do
+      mv ".$i-wrapped" "$i"
+    done
+    popd
+  '';
+
   meta = with lib; {
     homepage = http://mesonbuild.com;
     description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";

pkgs/development/tools/continuous-integration/jenkins/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.53";
+  version = "2.56";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "16lgwgp4n161j4vjwkzzdz4v2d6vv62rrqmcfmb6zalyvp6wpj9r";
+    sha256 = "1n0rqvnqv8dsqz8nmcxifg2qqs5hjqvi4bw3a3rjchndqyc3azij";
   };
 
   buildCommand = ''

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

@@ -95,6 +95,6 @@ stdenv.mkDerivation rec {
 
     /* Give binutils a lower priority than gcc-wrapper to prevent a
        collision due to the ld/as wrappers/symlinks in the latter. */
-    priority = "10";
+    priority = 10;
   };
 }

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

@@ -1,20 +1,18 @@
-{ stdenv, fetchgit, libmysql, libxslt, zlib, autoreconfHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysql,
+  libaio }:
 
 stdenv.mkDerivation rec {
-  name = "sysbench-2015-04-22";
+  name = "sysbench-1.0.6";
 
-  buildInputs = [ autoreconfHook libmysql libxslt zlib ];
+  buildInputs = [ autoreconfHook pkgconfig vim libmysql libaio ];
 
-  src = fetchgit {
-    url = git://github.com/akopytov/sysbench.git;
-    rev = "2b3042883090c9cf8cb9be2b24d3590cdcee112f";
-    sha256 = "1xlb3fracha3wva3dmmjk36b262vblynkmiz8n0mn1vkc78bssaw";
+  src = fetchFromGitHub {
+    owner = "akopytov";
+    repo = "sysbench";
+    rev = "1.0.6";
+    sha256 = "0y3hlhzrggyyxwf378n006zlg2kwhmhh6vq6il0qn9agjmjmhl5l";
   };
 
-  preAutoreconf = ''
-    touch NEWS AUTHORS
-  '';
-
   meta = {
     description = "Modular, cross-platform and multi-threaded benchmark tool";
     license = stdenv.lib.licenses.gpl2;

pkgs/development/tools/ocaml/cppo/default.nix

@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
 let
   pname = "cppo";
-  version = "1.3.2";
+  version = "1.5.0";
   webpage = "http://mjambon.com/${pname}.html";
 in
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
+assert stdenv.lib.versionAtLeast ocaml.version "3.12";
 stdenv.mkDerivation rec {
 
   name = "${pname}-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "mjambon";
     repo = pname;
     rev = "v${version}";
-    sha256 = "06j0zr78f04ahxi2459vjn61z25hkvs4dfj76200ydg3g6ifb3k1";
+    sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild ];

pkgs/development/tools/yarn/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yarn-${version}";
-  version = "0.22.0";
+  version = "0.23.2";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "1hs4fqjj9rg47ipcagpdk3grh7aa0ls3vsxq4q20d5hb43s9n5gs";
+    sha256 = "06vqi78q1wsybr4nsh8xjnqmjynljmb36h21j2ffmni1adxf4syq";
   };
 
   buildInputs = [makeWrapper nodejs];