Merge branch 'master' into staging.

Conflicts:
      pkgs/development/libraries/gtk+/2.x.nix
      pkgs/tools/security/gnupg/21.nix
      pkgs/top-level/all-packages.nix

6 files changed, 21 insertions, 20 deletions

diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix
index fb7d8e74e45..aab47dadc90 100644
--- a/pkgs/development/tools/analysis/findbugs/default.nix
+++ b/pkgs/development/tools/analysis/findbugs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "findbugs-3.0.0";
+stdenv.mkDerivation rec {
+  name = "findbugs-3.0.1";
 
   src = fetchurl {
-    url = mirror://sourceforge/findbugs/findbugs-3.0.0.tar.gz;
-    sha256 = "0csz6drzdz867r2p2wa4cvick6bv9dpz2yym9wrvp3fnxabmgiri";
+    url = "mirror://sourceforge/findbugs/${name}.tar.gz";
+    sha256 = "06b46fz4nid7qvm36r66zw01fr87y4jyz21ixw27b8hkqah0s3p8";
   };
 
   buildPhase = ''
@@ -34,8 +34,9 @@ stdenv.mkDerivation {
     EOF
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A static analysis tool to find bugs in Java programs automatically";
     homepage = http://findbugs.sourceforge.net/;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
index 085af9df3a3..ffa56aaa9a0 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="cl-launch";
-    version="4.1";
+    version="4.1.1";
     name="${baseName}-${version}";
-    hash="0fmxa8013sgxmbfmh1wqffywg72zynzlw5yyrdvy9qpx1my36pwb";
-    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.tar.gz";
-    sha256="0fmxa8013sgxmbfmh1wqffywg72zynzlw5yyrdvy9qpx1my36pwb";
+    hash="1nimbv1ms7fcikx8y6dxrzdm63psf4882z5kjr6qdyarqz6gaq20";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.1.tar.gz";
+    sha256="1nimbv1ms7fcikx8y6dxrzdm63psf4882z5kjr6qdyarqz6gaq20";
   };
   buildInputs = [
   ];
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 7d46b005919..e6169c48a44 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libtool, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "global-6.2.12";
+  name = "global-6.3.4";
 
   src = fetchurl {
     url = "mirror://gnu/global/${name}.tar.gz";
-    sha256 = "05jkhya1cs6yqhkf8nw5x56adkxxrqyga7sq7hx44dbf7alczwfa";
+    sha256 = "0hcplcayyjf42d8ygzla6142b5dq4ybq4wg3n3cgx3b5yfhvic85";
   };
 
   buildInputs = [ libtool ncurses ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     cp -v *.el "$out/share/emacs/site-lisp"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Source code tag system";
 
     longDescription = ''
@@ -37,11 +37,11 @@ stdenv.mkDerivation rec {
       operating system like GNU and BSD.
     '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
 
     homepage = http://www.gnu.org/software/global/;
 
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = with maintainers; [ pSub ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 2d8d4f9bcd7..088e1574ebe 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/help2man/;
 
     license = licenses.gpl3Plus;
-    platforms = platforms.gnu;         # arbitrary choice
+    platforms = platforms.all;
     maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index a4cd9b28607..43959c8a43c 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "strace-4.9";
+  name = "strace-4.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/strace/${name}.tar.xz";
-    sha256 = "0rbgznvrxzw7vfah7mwzb4j4mm9gp4hkpiyaghlivfa0qnjzwnq9";
+    sha256 = "1qhfwijxvblwdvvm70f8bhzs4fpbzqmwwbkfp636brzrds30s676";
   };
 
   nativeBuildInputs = [ perl ];
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index bd568eaf84d..2d02bf054b7 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -3,7 +3,7 @@
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
 
-let version = "2.1.1"; in
+let version = "2.1.2"; 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 = "1j60jsgls6kkkh2cv4gq36q0mf27nw8pc6k94n0yvjafjmwl3kks";
+    sha256 = "0l6s4bvspjl1l26bf33xf4k5imdzryas15s1isn6998aiakxq20n";
   };
 
   buildInputs = [ ocaml findlib yojson menhir ]