Merge branch 'master.upstream' into staging.upstream

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

@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "7.22.01"; in
+let version = "7.23.02"; in
 stdenv.mkDerivation {
   name = "icmake-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1pgl8bami4v86ja40in4fsdx940f6q85l1s4b9k53zl29pm85v5k";
+    sha256 = "0gp2f8bw9i7vccsbz878mri0k6fls2x8hklbbr6mayag397gr928";
     rev = version;
     repo = "icmake";
     owner = "fbb-git";

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

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, ninja, python3 }:
+
+stdenv.mkDerivation rec {
+  name = "meson-0.26.0";
+
+  src = fetchurl {
+    url = "https://github.com/jpakkane/meson/archive/0.26.0.tar.gz";
+    sha256 = "1hmfn1bkxnwsnlhw6x9ryfcm4zwsf2w7h51cll1xrxg1rq08fvck";
+  };
+
+  buildInputs = [ ninja python3 ];
+
+  installPhase = ''
+    ./install_meson.py --prefix=$out --destdir="$pkgdir/"
+  '';
+
+  meta = {
+    homepage = "http://mesonbuild.com";
+    description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.mbe ];
+  };
+}

pkgs/development/tools/literate-programming/eweb/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, python3, asciidoc }:
+
+stdenv.mkDerivation rec{
+
+  name = "eweb-${meta.version}";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/eweb/${name}.tar.bz2";
+    sha256 = "1xy7vm2sj5q6s620fm25klmnwnz9xkrxmx4q2f8h6c85ydisayd5";
+  };
+
+  buildInputs = [ python3 asciidoc ];
+
+  installPhase = ''
+    install -d $out/bin $out/share/doc/${name}
+    cp etangle.py $out/bin
+    cp etangle.w etangle.html $out/share/doc/${name}
+  '';
+
+  meta = with stdenv.lib; {
+    version = "9.10" ;
+    homepage = http://eweb.sf.net;
+    description = "An Asciidoc-based literate programming tool, written in Python";
+    platforms = platforms.linux;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}

pkgs/development/tools/literate-programming/funnelweb/default.nix

@@ -0,0 +1,31 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+
+  name = "funnelweb-${meta.version}";
+  src = fetchurl {
+    url = http://www.ross.net/funnelweb/download/funnelweb_v320/funnelweb_v320_source.tar.gz;
+    sha256 = "0zqhys0j9gabrd12mnk8ibblpc8dal4kbl8vnhxmdlplsdpwn4wg";
+  };
+
+  buildPhase = ''
+    cd source
+    ${stdenv.cc}/bin/cc -D__linux__ -o fw *.c
+  '';
+
+  installPhase = ''
+    install -d $out/bin
+    install fw $out/bin/fw
+  '';
+
+  meta = with stdenv.lib; {
+    version = "3.20";
+    description = "A simple, reliable literate-programming macro preprocessor";
+    homepage = http://www.ross.net/funnelweb/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
+#TODO: implement it for other platforms
+#TODO: Documentation files

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

@@ -3,7 +3,7 @@
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
 
-let version = "2.2"; in
+let version = "2.3"; in
 
 stdenv.mkDerivation {
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/the-lambda-church/merlin/archive/v${version}.tar.gz";
-    sha256 = "19n4gwpqav2kax5rl61bq354g7ycdahl4f3ihjp418hwi1phwbzz";
+    sha256 = "18glpvd572ajz0d66chx2ib5miy4b29q1qhc7sxb60mlsrffr13s";
   };
 
   buildInputs = [ ocaml findlib yojson menhir ]

pkgs/development/tools/sslmate/default.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, perlPackages, perl, makeWrapper, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "sslmate-1.5.0";
+
+  src = fetchurl {
+    url = "https://packages.sslmate.com/other/${name}.tar.gz";
+    sha256 = "1vxdkydwww4awi6ishvq68jvlj6vkbfw7pin1cdqpl84vs9q7ycg";
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  buildInputs = [ perl makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/sslmate --prefix PERL5LIB : \
+      "${with perlPackages; stdenv.lib.makePerlPath [
+        URI
+        JSONPP
+        TermReadKey
+      ]}" \
+      --prefix PATH : "${openssl}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://sslmate.com";
+    maintainers = maintainers.iElectric;
+    description = "Easy to buy, deploy, and manage your SSL certs";
+    platforms = platforms.unix;
+    license = licenses.mit; # X11
+  };
+}

pkgs/development/tools/watchman/default.nix

@@ -5,13 +5,13 @@
 stdenv.mkDerivation rec {
   name = "watchman-${version}";
 
-  version = "3.0.0";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "watchman";
     rev = "v${version}";
-    sha256 = "0sf0cp9p7savlgmzqj5m9fkpfa5a15pv98rkilxnbmx9wrjvypwk";
+    sha256 = "01ak2gsmc76baswpivzz00g22r547mpp8l7xfziwl5804nzszrcg";
   };
 
   buildInputs = [ autoconf automake pcre ];
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
       "--enable-lenient"
       "--enable-conffile=${if confFile == null then "no" else confFile}"
       "--with-pcre=yes"
+      "--disable-statedir"
   ];
 
   preConfigure = ''