Unverified Commit 33f80f08 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

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

parents 5c28518c 02843300

lib/licenses.nix

+5 −5
Original line number Diff line number Diff line
@@ -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

+4 −1
Original line number Diff line number Diff line
@@ -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

+4 −1
Original line number Diff line number Diff line
@@ -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

+4 −1
Original line number Diff line number Diff line
@@ -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

+4 −1
Original line number Diff line number Diff line
@@ -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;

  };