nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib.licenses.asl20-llvm: replace llvm-exception

Browse Source 
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.
This commit is contained in:
Alyssa Ross 2023-02-23 16:14:09 +00:00
parent 9f07aa4bab
commit 7ce8e7c4cf
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/licenses.nix
View File

@ -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";

2
pkgs/development/compilers/llvm/15/default.nix
View File

@ -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;
};

2
pkgs/development/libraries/libabigail/default.nix
View File

@ -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;
};

2
pkgs/development/libraries/wasilibc/default.nix
View File

@ -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 ];
};
}