lib.licenses: replace classpath license with exception

The GPL-2.0-with-classpath-exception is deprecated in spdx and the exception Classpath-exception-2.0 should be used instead.
Other Classpath license hace also benn replaced with it.

lib/licenses.nix

@@ -439,6 +439,11 @@ lib.mapAttrs mkLicense (
       fullName = "CeCILL-C Free Software License Agreement";
     };
 
+    classpathException20 = {
+      spdxId = "Classpath-exception-2.0";
+      fullName = "Classpath exception 2.0";
+    };
+
     cockroachdb-community-license = {
       fullName = "CockroachDB Community License Agreement";
       url = "https://www.cockroachlabs.com/cockroachdb-community-license/";
@@ -645,16 +650,6 @@ lib.mapAttrs mkLicense (
       fullName = "GNU General Public License v2.0 only";
     };
 
-    gpl2Classpath = {
-      spdxId = "GPL-2.0-with-classpath-exception";
-      fullName = "GNU General Public License v2.0 only (with Classpath exception)";
-    };
-
-    gpl2ClasspathPlus = {
-      fullName = "GNU General Public License v2.0 or later (with Classpath exception)";
-      url = "https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception";
-    };
-
     gpl2UBDLPlus = {
       fullName = "GNU General Public License v3.0 or later (with UBDL exception)";
       url = "https://spdx.org/licenses/UBDL-exception.html";
@@ -680,11 +675,6 @@ lib.mapAttrs mkLicense (
       fullName = "GNU General Public License v3.0 or later";
     };
 
-    gpl3ClasspathPlus = {
-      fullName = "GNU General Public License v3.0 or later (with Classpath exception)";
-      url = "https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception";
-    };
-
     giftware = {
       spdxId = "Giftware";
       fullName = "Giftware License";

pkgs/applications/editors/greenfoot/default.nix

@@ -55,7 +55,10 @@ stdenv.mkDerivation rec {
     description = "Simple integrated development environment for Java";
     homepage = "https://www.greenfoot.org/";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.gpl2ClasspathPlus;
+    license = with licenses; [
+      gpl2Plus
+      classpathException20
+    ];
     mainProgram = "greenfoot";
     maintainers = [ maintainers.chvp ];
     platforms = platforms.linux;

pkgs/by-name/bl/bluej/package.nix

@@ -59,7 +59,10 @@ stdenv.mkDerivation rec {
     description = "Simple integrated development environment for Java";
     homepage = "https://www.bluej.org/";
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    license = lib.licenses.gpl2ClasspathPlus;
+    license = with lib.licenses; [
+      gpl2Plus
+      classpathException20
+    ];
     mainProgram = "bluej";
     maintainers = with lib.maintainers; [ chvp ];
     platforms = lib.platforms.linux;

pkgs/by-name/jo/jol/package.nix

@@ -47,7 +47,10 @@ maven.buildMavenPackage rec {
     '';
     homepage = "https://openjdk.org/projects/code-tools/jol/";
     changelog = "https://github.com/openjdk/jol/releases/tag/${version}";
-    license = lib.licenses.gpl2ClasspathPlus;
+    license = with lib.licenses; [
+      gpl2Plus
+      classpathException20
+    ];
     sourceProvenance = with lib.sourceTypes; [
       fromSource
       binaryBytecode

pkgs/by-name/op/openjfx/package.nix

@@ -190,7 +190,10 @@ stdenv.mkDerivation {
   meta = {
     description = "Next-generation Java client toolkit";
     homepage = "https://openjdk.org/projects/openjfx/";
-    license = lib.licenses.gpl2Classpath;
+    license = with lib.licenses; [
+      gpl2
+      classpathException20
+    ];
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };

pkgs/by-name/vi/visualvm/package.nix

@@ -50,7 +50,10 @@ stdenv.mkDerivation rec {
       SE platform.
     '';
     homepage = "https://visualvm.github.io";
-    license = licenses.gpl2ClasspathPlus;
+    license = with licenses; [
+      gpl2Plus
+      classpathException20
+    ];
     platforms = platforms.all;
     maintainers = with maintainers; [
       michalrus

pkgs/development/compilers/abcl/default.nix

@@ -59,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "JVM-based Common Lisp implementation";
     homepage = "https://common-lisp.net/project/armedbear/";
-    license = lib.licenses.gpl2Classpath;
+    license = with lib.licenses; [
+      gpl2
+      classpathException20
+    ];
     mainProgram = "abcl";
     teams = [ lib.teams.lisp ];
     platforms = lib.platforms.darwin ++ lib.platforms.linux;

pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix

@@ -258,7 +258,8 @@ let
             description = "High-Performance Polyglot VM";
             license = with licenses; [
               upl
-              gpl2Classpath
+              gpl2
+              classpathException20
               bsd3
             ];
             sourceProvenance = with sourceTypes; [ binaryNativeCode ];

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

@@ -74,7 +74,10 @@ let
     };
 
     meta = with lib; {
-      license = licenses.gpl2Classpath;
+      license = with licenses; [
+        gpl2
+        classpathException20
+      ];
       sourceProvenance = with sourceTypes; [
         binaryNativeCode
         binaryBytecode

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

@@ -130,7 +130,10 @@ let
     };
 
     meta = with lib; {
-      license = licenses.gpl2Classpath;
+      license = with licenses; [
+        gpl2
+        classpathException20
+      ];
       sourceProvenance = with sourceTypes; [
         binaryNativeCode
         binaryBytecode

pkgs/os-specific/linux/firmware/ath9k/default.nix

@@ -164,7 +164,8 @@ stdenv.mkDerivation (finalAttrs: {
     license = with lib.licenses; [
       # see NOTICE.txt for details
       bsd3 # almost everything; "the ClearBSD licence"
-      gpl2ClasspathPlus # **/*cmnos_printf.c, only three files
+      gpl2Plus # **/*cmnos_printf.c, only three files
+      classpathException20 # **/*cmnos_printf.c, only three files
       mit # **/xtos, **/xtensa
     ];