diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-24 05:07:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-24 05:07:48 +0000 |
| commit | 6a1e9345c06c7323dd2ab8f84683cdbb520ae3e9 (patch) | |
| tree | 69e2668722cbcc3db2a014372d516b92010a18c2 /pkgs/development/compilers/llvm | |
| parent | 79484b17078c06763dafd4dcaab67aebc129dfd9 (diff) | |
| parent | baa8a3d30c2bfd17c4df19f8cb0da0935f2af332 (diff) | |
| download | nixlib-6a1e9345c06c7323dd2ab8f84683cdbb520ae3e9.tar nixlib-6a1e9345c06c7323dd2ab8f84683cdbb520ae3e9.tar.gz nixlib-6a1e9345c06c7323dd2ab8f84683cdbb520ae3e9.tar.bz2 nixlib-6a1e9345c06c7323dd2ab8f84683cdbb520ae3e9.tar.lz nixlib-6a1e9345c06c7323dd2ab8f84683cdbb520ae3e9.tar.xz nixlib-6a1e9345c06c7323dd2ab8f84683cdbb520ae3e9.tar.zst nixlib-6a1e9345c06c7323dd2ab8f84683cdbb520ae3e9.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers/llvm')
5 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix index 3c335345f623..6f20d23b32bc 100644 --- a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix @@ -151,5 +151,8 @@ stdenv.mkDerivation { implementations of run-time libraries for dynamic testing tools such as AddressSanitizer, ThreadSanitizer, MemorySanitizer, and DataFlowSanitizer. ''; + # "All of the code in the compiler-rt project is dual licensed under the MIT + # license and the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; }; } diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index 526e79992b88..0cef33ea61cc 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 asl20-llvm ]; + license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/15/libcxx/default.nix b/pkgs/development/compilers/llvm/15/libcxx/default.nix index 7762df29386e..94374c8a312d 100644 --- a/pkgs/development/compilers/llvm/15/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/15/libcxx/default.nix @@ -103,5 +103,8 @@ stdenv.mkDerivation rec { libc++ is an implementation of the C++ standard library, targeting C++11, C++14 and above. ''; + # "All of the code in libc++ is dual licensed under the MIT license and the + # UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; }; } diff --git a/pkgs/development/compilers/llvm/15/libcxxabi/default.nix b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix index fd99f4553c0c..cb5fa44f0700 100644 --- a/pkgs/development/compilers/llvm/15/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix @@ -100,6 +100,9 @@ stdenv.mkDerivation rec { longDescription = '' libc++abi is a new implementation of low level support for a standard C++ library. ''; + # "All of the code in libc++abi is dual licensed under the MIT license and + # the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; }; } diff --git a/pkgs/development/compilers/llvm/15/openmp/default.nix b/pkgs/development/compilers/llvm/15/openmp/default.nix index 8047cb1122de..d51335436ad2 100644 --- a/pkgs/development/compilers/llvm/15/openmp/default.nix +++ b/pkgs/development/compilers/llvm/15/openmp/default.nix @@ -67,5 +67,8 @@ stdenv.mkDerivation rec { "clang -fopenmp" must be linked before it can run and the library that supports offload to target devices. ''; + # "All of the code is dual licensed under the MIT license and the UIUC + # License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; }; } |