diff --git a/lib/licenses.nix b/lib/licenses.nix index 0c4d9d8bc9e1..cf8caff2a780 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 db98f2854a09..526e79992b88 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 46929cee9a46..0e8c44a9d0d4 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 8a8c4ec059ef..0dce309ef5c7 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 ]; }; }