lib.licenses: some more cleanup (#439307)

lib/licenses.nix

@@ -157,6 +157,11 @@ lib.mapAttrs mkLicense (
       fullName = "Artistic License 2.0";
     };
 
+    asl11 = {
+      spdxId = "Apache-1.1";
+      fullName = "Apache License 1.1";
+    };
+
     asl20 = {
       spdxId = "Apache-2.0";
       fullName = "Apache License 2.0";
@@ -279,11 +284,6 @@ lib.mapAttrs mkLicense (
       redistributable = true;
     };
 
-    caossl = {
-      fullName = "Computer Associates Open Source Licence Version 1.0";
-      url = "http://jxplorer.org/licence.html";
-    };
-
     cal10 = {
       spdxId = "CAL-1.0";
       fullName = "Cryptographic Autonomy License version 1.0 (CAL-1.0)";
@@ -932,6 +932,11 @@ lib.mapAttrs mkLicense (
       fullName = "Lucent Public License v1.02";
     };
 
+    lsof = {
+      spdxId = "lsof";
+      fullName = "lsof License"; # also known as Purdue BSD-Style License
+    };
+
     miros = {
       spdxId = "MirOS";
       fullName = "MirOS License";
@@ -1159,11 +1164,6 @@ lib.mapAttrs mkLicense (
       fullName = "Public Domain";
     };
 
-    purdueBsd = {
-      fullName = "Purdue BSD-Style License"; # also known as lsof license
-      url = "https://enterprise.dejacode.com/licenses/public/purdue-bsd";
-    };
-
     prosperity30 = {
       fullName = "Prosperity-3.0.0";
       free = false;
@@ -1180,14 +1180,9 @@ lib.mapAttrs mkLicense (
       fullName = "Q Public License 1.0";
     };
 
-    qwt = {
-      fullName = "Qwt License, Version 1.0";
-      url = "https://qwt.sourceforge.io/qwtlicense.html";
-    };
-
-    radiance = {
-      fullName = "The Radiance Software License, Version 2.0";
-      url = "https://github.com/LBNL-ETA/Radiance/blob/master/License.txt";
+    qwtException = {
+      spdxId = "Qwt-exception-1.0";
+      fullName = "Qwt exception 1.0";
     };
 
     ruby = {

pkgs/by-name/jx/jxplorer/package.nix

@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Java Ldap Browser";
     homepage = "https://sourceforge.net/projects/jxplorer/";
-    license = lib.licenses.caossl;
+    license = lib.licenses.asl11;
     maintainers = with maintainers; [ benwbooth ];
     platforms = platforms.linux;
     mainProgram = "jxplorer";

pkgs/by-name/ls/lsof/package.nix

@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
       socket (IPv6/IPv4/UNIX local), or partition (by opening a file
       from it).
     '';
-    license = lib.licenses.purdueBsd;
+    license = lib.licenses.lsof;
     maintainers = with lib.maintainers; [ dezgeg ];
     platforms = lib.platforms.unix;
   };

pkgs/by-name/ra/radiance/package.nix

@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Validated Lighting Simulation Tool";
     homepage = "https://github.com/LBNL-ETA/Radiance";
-    license = lib.licenses.radiance;
+    license = lib.licenses.bsd3Lbnl;
     maintainers = with lib.maintainers; [ robwalt ];
     mainProgram = "rad";
   };

pkgs/development/libraries/qwt/6_1.nix

@@ -36,7 +36,10 @@ stdenv.mkDerivation rec {
     description = "Qt widgets for technical applications";
     homepage = "http://qwt.sourceforge.net/";
     # LGPL 2.1 plus a few exceptions (more liberal)
-    license = licenses.qwt;
+    license = with lib.licenses; [
+      lgpl21Only
+      qwtException
+    ];
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };

pkgs/development/libraries/qwt/default.nix

@@ -42,7 +42,10 @@ stdenv.mkDerivation rec {
     description = "Qt widgets for technical applications";
     homepage = "http://qwt.sourceforge.net/";
     # LGPL 2.1 plus a few exceptions (more liberal)
-    license = lib.licenses.qwt;
+    license = with lib.licenses; [
+      lgpl21Only
+      qwtException
+    ];
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };