Merge staging-next into staging

pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix

@@ -49,6 +49,7 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name;
     platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms
     maintainers = with lib.maintainers; [ taku0 ];
     inherit knownVulnerabilities;
+    mainProgram = "java";
   };
 
 }; in result

pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix

@@ -108,6 +108,7 @@ let result = stdenv.mkDerivation rec {
     platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
     maintainers = with lib.maintainers; [ taku0 ];
     inherit knownVulnerabilities;
+    mainProgram = "java";
   };
 
 }; in result

pkgs/development/compilers/openjdk/11.nix

@@ -142,6 +142,7 @@ let
       description = "The open-source Java Development Kit";
       maintainers = with maintainers; [ edwtjo asbachb ];
       platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
+      mainProgram = "java";
     };
 
     passthru = {

pkgs/development/compilers/openjdk/12.nix

@@ -151,6 +151,7 @@ let
       description = "The open-source Java Development Kit";
       maintainers = with maintainers; [ edwtjo ];
       platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
+      mainProgram = "java";
     };
 
     passthru = {

pkgs/development/compilers/openjdk/13.nix

@@ -151,6 +151,7 @@ let
       description = "The open-source Java Development Kit";
       maintainers = with maintainers; [ edwtjo ];
       platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
+      mainProgram = "java";
     };
 
     passthru = {

pkgs/development/compilers/openjdk/14.nix

@@ -147,6 +147,7 @@ let
       description = "The open-source Java Development Kit";
       maintainers = with maintainers; [ edwtjo ];
       platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
+      mainProgram = "java";
     };
 
     passthru = {

pkgs/development/compilers/openjdk/15.nix

@@ -147,6 +147,7 @@ let
       description = "The open-source Java Development Kit";
       maintainers = with maintainers; [ edwtjo ];
       platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
+      mainProgram = "java";
     };
 
     passthru = {

pkgs/development/compilers/openjdk/16.nix

@@ -153,6 +153,7 @@ let
       description = "The open-source Java Development Kit";
       maintainers = with maintainers; [ edwtjo ];
       platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
+      mainProgram = "java";
     };
 
     passthru = {

pkgs/development/compilers/openjdk/8.nix

@@ -262,6 +262,7 @@ let
       description = "The open-source Java Development Kit";
       maintainers = with maintainers; [ edwtjo ];
       platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
+      mainProgram = "java";
     };
 
     passthru = {

pkgs/development/compilers/oraclejdk/jdk-linux-base.nix

@@ -184,6 +184,7 @@ let result = stdenv.mkDerivation rec {
   meta = with lib; {
     license = licenses.unfree;
     platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms
+    mainProgram = "java";
   };
 
 }; in result

pkgs/development/compilers/zulu/8.nix

@@ -105,5 +105,6 @@ in stdenv.mkDerivation {
     '';
     maintainers = with maintainers; [ fpletz ];
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    mainProgram = "java";
   };
 }

pkgs/development/compilers/zulu/default.nix

@@ -108,5 +108,6 @@ in stdenv.mkDerivation {
     '';
     maintainers = with maintainers; [ fpletz ];
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    mainProgram = "java";
   };
 }