From 7ce8e7c4cf90492a631e96bcfe70724104914381 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 23 Feb 2023 16:14:09 +0000
Subject: lib.licenses.asl20-llvm: replace llvm-exception

LLVM-exception only makes sense when used with the Apache 2.0 license,
so let's combine them, so it's not possible to forget one of them like
happened with llvm_15.
---
 lib/licenses.nix                                  | 10 +++++-----
 pkgs/development/compilers/llvm/15/default.nix    |  2 +-
 pkgs/development/libraries/libabigail/default.nix |  2 +-
 pkgs/development/libraries/wasilibc/default.nix   |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 0c4d9d8bc9e..cf8caff2a78 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -109,6 +109,11 @@ in mkLicense lset) ({
     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";
@@ -657,11 +662,6 @@ in mkLicense lset) ({
     url = "https://opensource.franz.com/preamble.html";
   };
 
-  llvm-exception = {
-    spdxId = "LLVM-exception";
-    fullName = "LLVM Exception"; # LLVM exceptions to the Apache 2.0 License
-  };
-
   lppl12 = {
     spdxId = "LPPL-1.2";
     fullName = "LaTeX Project Public License v1.2";
diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix
index db98f2854a0..526e79992b8 100644
--- a/pkgs/development/compilers/llvm/15/default.nix
+++ b/pkgs/development/compilers/llvm/15/default.nix
@@ -84,7 +84,7 @@ in let
   inherit (releaseInfo) release_version version;
 
   llvm_meta = {
-    license     = with lib.licenses; [ ncsa llvm-exception ];
+    license     = with lib.licenses; [ ncsa asl20-llvm ];
     maintainers = lib.teams.llvm.members;
     platforms   = lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix
index 46929cee9a4..0e8c44a9d0d 100644
--- a/pkgs/development/libraries/libabigail/default.nix
+++ b/pkgs/development/libraries/libabigail/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "ABI Generic Analysis and Instrumentation Library";
     homepage = "https://sourceware.org/libabigail/";
-    license = with licenses; [ asl20 llvm-exception ];
+    license = licenses.asl20-llvm;
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix
index 8a8c4ec059e..0dce309ef5c 100644
--- a/pkgs/development/libraries/wasilibc/default.nix
+++ b/pkgs/development/libraries/wasilibc/default.nix
@@ -63,6 +63,6 @@ stdenv.mkDerivation {
     homepage = "https://wasi.dev";
     platforms = platforms.wasi;
     maintainers = with maintainers; [ matthewbauer rvolosatovs ];
-    license = with licenses; [ asl20 mit llvm-exception ];
+    license = with licenses; [ asl20-llvm mit ];
   };
 }
-- 
cgit 1.4.1