Merge branch 'master' into staging-next

Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190

pkgs/development/tools/parsing/antlr/2.7.7.nix

@@ -20,6 +20,7 @@ stdenv.mkDerivation {
       walk parse trees.
     '';
     homepage = http://www.antlr.org/;
+    license = licenses.bsd3;
     platforms = platforms.unix;
   };
 }

pkgs/development/tools/parsing/antlr/3.4.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   unpackPhase = "true";
- 
+
   installPhase = ''
     mkdir -p "$out"/{lib/antlr,bin}
     cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar"
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
       walk parse trees.
     '';
     homepage = http://www.antlr.org/;
+    license = licenses.bsd3;
     platforms = platforms.linux ++ platforms.darwin;
   };
 }

pkgs/development/tools/parsing/antlr/3.5.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   unpackPhase = "true";
- 
+
   installPhase = ''
     mkdir -p "$out"/{lib/antlr,bin}
     cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar"
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
       walk parse trees.
     '';
     homepage = http://www.antlr.org/;
+    license = licenses.bsd3;
     platforms = platforms.linux;
   };
 }

pkgs/development/tools/parsing/antlr/4.7.nix

@@ -28,6 +28,7 @@ let
       meta = with stdenv.lib; {
         description = "C++ target for ANTLR 4";
         homepage = http://www.antlr.org/;
+        license = licenses.bsd3;
         platforms = platforms.unix;
       };
     };
@@ -73,6 +74,7 @@ let
         walk parse trees.
       '';
       homepage = http://www.antlr.org/;
+      license = licenses.bsd3;
       platforms = platforms.unix;
     };
   };