Merge remote-tracking branch 'origin/master' into systemd-219

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

@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.10.1";
+  version = "6.11.2";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "18axx444hzi1gcbqa7nyifdvyqsiab0asya4qwa7y6khiq7y3myb";
+    sha256 = "13ywwm24199c942w9ly2cvy6rjbs0sim50lrvjybc0sh6gbg44sc";
   };
 
   installPhase = ''

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/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/build-managers/sbt/default.nix

@@ -5,22 +5,18 @@ stdenv.mkDerivation rec {
   version = "0.13.9";
 
   src = fetchurl {
-    url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar";
-    sha256 = "04k411gcrq35ayd2xj79bcshczslyqkicwvhkf07hkyr4j3blxda";
+    url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
+    sha256 = "148f2801f2993773de6f8859fe0e6520fcabe649d66bb316e13aff8b2fd7f504";
   };
 
-  phases = [ "installPhase" ];
+  patchPhase = ''
+    echo -java-home ${jre.home} >>conf/sbtopts
+  '';
 
   installPhase = ''
-    mkdir -p $out/bin
-    cat > $out/bin/sbt << EOF
-    #! ${stdenv.shell}
-    if [ ! -v JAVA_HOME ]; then
-        export JAVA_HOME="${jre.home}"
-    fi
-    ${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@"
-    EOF
-    chmod +x $out/bin/sbt
+    mkdir -p $out/share/sbt $out/bin
+    cp -ra . $out/share/sbt
+    ln -s $out/share/sbt/bin/sbt $out/bin/
   '';
 
   meta = {

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

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "1.631";
+  version = "1.633";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "0bfh5gv3yk9awkzf660jxf9vzzdcr6qa9hl0hkivaj4gmp5f9sp8";
+    sha256 = "1s5jihq9shscsdazb1c393qab0djms4by5zn3ciylcgvif431n8m";
   };
   meta = with stdenv.lib; {
     description = "An extendable open source continuous integration server";

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/jq/default.nix

@@ -3,11 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="jq";
-    version="1.4";
+    version="1.5";
     name="${baseName}-${version}";
-    hash="17dk17h7qj6xpnsbc09qwsqkm6r7jhqbfkjvwq246yxmpsx4334r";
-    url="http://stedolan.github.io/jq/download/source/jq-1.4.tar.gz";
-    sha256="17dk17h7qj6xpnsbc09qwsqkm6r7jhqbfkjvwq246yxmpsx4334r";
+    url="https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz";
+    sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4";
   };
   buildInputs = [
   ];

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/literate-programming/nuweb/default.nix

@@ -0,0 +1,37 @@
+{stdenv, fetchurl, tex}:
+
+stdenv.mkDerivation rec{
+
+  name = "nuweb-${version}";
+  version = "1.58";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/nuweb/${name}.tar.gz";
+    sha256 = "0q51i3miy15fv4njjp82yws01qfjxvqx5ly3g3vh8z3h7iq9p47y";
+  };
+
+  buildInputs = [ tex ];
+
+  patchPhase = ''
+    sed -ie 's|nuweb -r|./nuweb -r|' Makefile
+  '';
+  buildPhase = ''
+    make nuweb
+    make nuweb.pdf nuwebdoc.pdf all
+  '';
+  installPhase = ''
+    install -d $out/bin $out/share/man/man1 $out/share/doc/${name} $out/share/emacs/site-lisp
+    cp nuweb $out/bin
+    cp nuweb.el $out/share/emacs/site-lisp
+    gzip -c nuweb.1 > $out/share/man/man1/nuweb.1.gz
+    cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${name}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple literate programming tool";
+    homepage = http://nuweb.sourceforge.net;
+    license = licenses.free;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
+# TODO: nuweb.el Emacs integration

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

@@ -2,8 +2,8 @@
 
 let
   name = "ccache-${version}";
-  version = "3.2.3";
-  sha256 = "03k0fvblwqb80zwdgas8a5fjrwvghgsn587wp3lfr0jr8gy1817c";
+  version = "3.2.4";
+  sha256 = "0pga3hvd80f2p7mz88jmmbwzxh4vn5ihyjx5f6na8y2fclzsjg8w";
 
   ccache =
 stdenv.mkDerivation {

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/misc/kibana/default.nix

@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
   version = "4.1.2";
 
   src = fetchurl {
-    url = "http://download.elastic.co/kibana/kibana-snapshot/kibana-4.2.0-snapshot-linux-x86.tar.gz";
-    sha256 = "1sa92laawxc05abiysvp12v5nzrqggmls592mkprwnbkkkbwsm5x";
+    url = "http://download.elastic.co/kibana/kibana-snapshot/${name}-snapshot-linux-x86.tar.gz";
+    sha256 = "00ag4wnlw6h2j6zcz0irz6j1s51fr9ix2g1smrhrdw44z5gb6wrh";
   };
 
   buildInputs = [ makeWrapper ];

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

@@ -1,72 +0,0 @@
-{stdenv, fetchurl, zlib, ocaml, findlib, ncurses
-, versionedDerivation, unzip
-, version ?
-    let match = {
-      "ocaml-3.10.0" = "for-3.10.0";
-      "ocaml-3.12.1" = "for-3.12.1";
-    }; in stdenv.lib.maybeAttr ocaml.name (throw "no matching source of ocaml-deriving for ocaml version: ${ocaml.name}") match
-}:
-
-/*
-Usage example:
-
-== main.ml ==
-type t = | A | B
-  deriving (Show)
-
-print_string (Show.show<t> (A));;
-==
-
-ocamlopt -pp $out/bin/deriving -I $d/lib -I $d/syntax nums.cmxa show.cmx main.ml
-*/
-
-versionedDerivation "ocaml-deriving" version {
-
-  "for-3.10.0" = {
-    name = "deriving-0.1.1a";
-      # ocaml: 3.10.0
-    src = fetchurl {
-      url = https://deriving.googlecode.com/files/deriving-0.1.1a.tar.gz;
-      sha256 = "0ppmqhc23kccfjn3cnd9n205ky627ni8f5djf8sppmc3lc1m97mb";
-    };
-  };
-
-  "for-3.12.1" = {
-    name = "deriving-git20100903";
-
-    # https://github.com/jaked/deriving
-    src = fetchurl {
-      name = "for-3.12.0.zip";
-      url = https://codeload.github.com/jaked/deriving/zip/c7b9cea3eb4bbfb9e09673faf725f70247c9df78;
-      sha256 = "1zrmpqb5lsjmizqs68czmfpsbz9hz30pf97w11kkby175hhj84gi";
-    };
-
-    buildInputs = [ unzip ];
-  };
-
-}
-{
-  buildInputs = [ocaml findlib];
-
-  installPhase = ''
-    # not all tests compile !?
-    # (cd tests; make)
-
-    mkdir -p $out/bin
-    cp -a lib $out/
-    cp -a syntax $out
-
-    # this allows -pp deriving
-    ln -s $out/syntax/deriving $out/bin/deriving
-  '';
-
-  meta = {
-    homepage = "https://code.google.com/p/deriving/source/checkout";
-    description = "A library of cryptographic primitives for OCaml";
-    license = stdenv.lib.licenses.mit;
-    platforms = ocaml.meta.platforms;
-    maintainers = [
-      stdenv.lib.maintainers.z77z
-    ];
-  };
-}

pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff

@@ -8,3 +8,14 @@
  
  ####
  
+--- old/Makefile	2014-09-30 16:40:37.000000000 +0200
++++ new/Makefile	2015-10-14 10:28:41.366815864 +0200
+@@ -52,7 +52,7 @@
+ install-bin:
+ 	install -d -m 755 $(BINDIR)
+ 	install $(BIN) $(BINDIR)
+-	install $(TOOLS) $(BINDIR)
++	install $(TOOLS) $(BINDIR) || true
+ 
+ uninstall: uninstall-lib uninstall-bin
+ 

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/ocaml/ocp-indent/default.nix

@@ -1,23 +1,25 @@
-{ stdenv, fetchurl, ocaml, findlib, ocpBuild, opam, cmdliner }:
+{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }:
 
 let inherit (stdenv.lib) getVersion versionAtLeast; in
 
 assert versionAtLeast (getVersion ocaml) "3.12.1";
-assert versionAtLeast (getVersion ocpBuild) "1.99.3-beta";
+assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
 
 stdenv.mkDerivation {
 
-  name = "ocp-indent-1.4.2b";
+  name = "ocp-indent-1.5.2";
 
-  src = fetchurl {
-    url = "https://github.com/OCamlPro/ocp-indent/archive/1.4.2b.tar.gz";
-    sha256 = "1p0n2zcl5kf543x2xlqrz1aa51f0dqal8l392sa41j6wx82j0gpb";
+  src = fetchzip {
+    url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz";
+    sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
   };
 
   buildInputs = [ ocaml findlib ocpBuild opam cmdliner ];
 
   createFindlibDestdir = true;
 
+  preConfigure = "patchShebangs ./install.sh";
+
   postInstall = ''
     mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/}
   '';

pkgs/development/tools/ocaml/ocp-index/default.nix

@@ -2,7 +2,7 @@
 
 let inherit (stdenv.lib) getVersion versionAtLeast optional; in
 
-assert versionAtLeast (getVersion ocaml) "3.12.1";
+assert versionAtLeast (getVersion ocaml) "4";
 assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
 assert versionAtLeast (getVersion ocpIndent) "1.4.2";
 

pkgs/development/tools/profiling/oprofile/default.nix

@@ -1,21 +1,22 @@
-{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig
+{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders
 , withGUI ? false , qt4 ? null}:
 
 # libX11 is needed because the Qt build stuff automatically adds `-lX11'.
 assert withGUI -> qt4 != null;
 
 stdenv.mkDerivation rec {
-  name = "oprofile-1.0.0";
+  name = "oprofile-1.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/oprofile/${name}.tar.gz";
-    sha256 = "0nn4wfvwy4nii25y6lwlrnzx9ah4nz0r93yk7hswiy6wxjs10wc4";
+    sha256 = "0v1nn38h227bgxjwqf22rjp2iqgjm4ls3gckzifks0x6w5nrlxfg";
   };
 
-  buildInputs = [ binutils zlib popt pkgconfig ]
+  buildInputs = [ binutils zlib popt pkgconfig linuxHeaders ]
     ++ stdenv.lib.optionals withGUI [ qt4 ];
 
   configureFlags = [
+      "--with-kernel=${linuxHeaders}"
       "--disable-shared"   # needed because only the static libbfd is available
     ]
     ++ stdenv.lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4";

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";

pkgs/development/tools/slimerjs/default.nix

@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     echo 'export SLIMERJSLAUNCHER=${firefox}/bin/firefox' >>  "$out/bin/slimerjs"
     echo "'$out/lib/slimerjs/slimerjs' \"\$@\"" >> "$out/bin/slimerjs"
     chmod a+x "$out/bin/slimerjs"
-    sed -e 's@MaxVersion=3[0-9][.]@MaxVersion=40.@' -i "$out/lib/slimerjs/application.ini"
+    sed -e 's@MaxVersion=[34][0-9][.]@MaxVersion=50.@' -i "$out/lib/slimerjs/application.ini"
   '';
   meta = {
     inherit (s) version;

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 = ''