lib.licenses.asl20-llvm: replace with separate llvm-exception (#390638)

lib/licenses.nix

@@ -140,11 +140,6 @@ lib.mapAttrs mkLicense ({
     fullName = "Apache License 2.0";
   };
 
-  asl20-llvm = {
-    spdxId = "Apache-2.0 WITH LLVM-exception";
-    fullName = "Apache License 2.0 with LLVM Exceptions";
-  };
-
   bitstreamVera = {
     spdxId = "Bitstream-Vera";
     fullName = "Bitstream Vera Font License";
@@ -859,6 +854,11 @@ lib.mapAttrs mkLicense ({
     url = "https://opensource.franz.com/preamble.html";
   };
 
+  llvm-exception = {
+    spdxId = "LLVM-exception";
+    fullName = "LLVM Exception"; # LLVM exceptions to the Apache 2.0 License
+  };
+
   lppl1 = {
     spdxId = "LPPL-1.0";
     fullName = "LaTeX Project Public License v1.0";

pkgs/by-name/co/codechecker/package.nix

@@ -113,7 +113,10 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/Ericsson/codechecker";
     changelog = "https://github.com/Ericsson/codechecker/releases/tag/v${version}";
     description = "Analyzer tooling, defect database and viewer extension for the Clang Static Analyzer and Clang Tidy";
-    license = licenses.asl20-llvm;
+    license = with licenses; [
+      asl20
+      llvm-exception
+    ];
     maintainers = with maintainers; [
       zebreus
       felixsinger

pkgs/by-name/en/enzyme/package.nix

@@ -44,6 +44,9 @@ llvmPackages.stdenv.mkDerivation rec {
     description = "High-performance automatic differentiation of LLVM and MLIR";
     maintainers = with lib.maintainers; [ kiranshila ];
     platforms = lib.platforms.all;
-    license = lib.licenses.asl20-llvm;
+    license = with lib.licenses; [
+      asl20
+      llvm-exception
+    ];
   };
 }

pkgs/by-name/ko/kokkos/package.nix

@@ -38,7 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "C++ Performance Portability Programming EcoSystem";
     homepage = "https://github.com/kokkos/kokkos";
     changelog = "https://github.com/kokkos/kokkos/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = with licenses; [ asl20-llvm ];
+    license = with licenses; [
+      asl20
+      llvm-exception
+    ];
     maintainers = with maintainers; [ Madouura ];
     platforms = platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;

pkgs/by-name/li/libabigail/package.nix

@@ -58,7 +58,10 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "ABI Generic Analysis and Instrumentation Library";
     homepage = "https://sourceware.org/libabigail/";
-    license = licenses.asl20-llvm;
+    license = with licenses; [
+      asl20
+      llvm-exception
+    ];
     maintainers = [ ];
     platforms = platforms.linux;
   };

pkgs/by-name/sh/shader-slang/package.nix

@@ -144,7 +144,10 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "A shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion";
     homepage = "https://github.com/shader-slang/slang";
-    license = lib.licenses.asl20-llvm;
+    license = with lib.licenses; [
+      asl20
+      llvm-exception
+    ];
     maintainers = with lib.maintainers; [ niklaskorz ];
     mainProgram = "slangc";
     platforms = lib.platforms.all;

pkgs/development/compilers/llvm/common/common-let.nix

@@ -10,9 +10,9 @@
 rec {
   llvm_meta = {
     license = with lib.licenses; [ ncsa ] ++
-      # Contributions after June 1st, 2024 are only licensed under asl20-llvm:
-      # https://github.com/llvm/llvm-project/pull/92394
-      lib.optional (lib.versionAtLeast release_version "19") asl20-llvm;
+      # Contributions after June 1st, 2024 are only licensed under asl20 and
+      # llvm-exception: https://github.com/llvm/llvm-project/pull/92394
+      lib.optionals (lib.versionAtLeast release_version "19") [ asl20 llvm-exception ];
     maintainers = lib.teams.llvm.members;
 
     # See llvm/cmake/config-ix.cmake.

pkgs/development/libraries/wasilibc/default.nix

@@ -72,7 +72,8 @@ stdenv.mkDerivation {
       rvolosatovs
     ];
     license = with licenses; [
-      asl20-llvm
+      asl20
+      llvm-exception
       mit
     ];
   };