Merge remote-tracking branch 'upstream/master' into staging

pkgs/development/compilers/llvm/4/lldb.nix

@@ -43,6 +43,11 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  postInstall = ''
+    mkdir -p $out/share/man/man1
+    cp ../docs/lldb.1 $out/share/man/man1/
+  '';
+
   meta = with stdenv.lib; {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;

pkgs/development/compilers/llvm/5/lldb.nix

@@ -42,6 +42,11 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  postInstall = ''
+    mkdir -p $out/share/man/man1
+    cp ../docs/lldb.1 $out/share/man/man1/
+  '';
+
   meta = with stdenv.lib; {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;

pkgs/development/compilers/squeak/default.nix

@@ -43,6 +43,5 @@ stdenv.mkDerivation rec {
     downloadPage = http://squeakvm.org/unix/index.html;
     license = with licenses; [ asl20 mit ];
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
   };
 }