Commit 7e3c021b authored by jopejoe1's avatar jopejoe1
Browse files

lib.licenses: caossl rename to asl11 

This is just the Apache-1.1 license so make use of it and not some random name
parent e85bfdae

lib/licenses.nix

+5 −5
Original line number Diff line number Diff line
@@ -152,6 +152,11 @@ lib.mapAttrs mkLicense ( 
      fullName = "Artistic License 2.0";

    };



    asl11 = {

      spdxId = "Apache-1.1";

      fullName = "Apache License 1.1";

    };



    asl20 = {

      spdxId = "Apache-2.0";

      fullName = "Apache License 2.0";
@@ -274,11 +279,6 @@ lib.mapAttrs mkLicense ( 
      redistributable = true;

    };



    caossl = {

      fullName = "Computer Associates Open Source Licence Version 1.0";

      url = "http://jxplorer.org/licence.html";

    };



    cal10 = {

      spdxId = "CAL-1.0";

      fullName = "Cryptographic Autonomy License version 1.0 (CAL-1.0)";

pkgs/by-name/jx/jxplorer/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec { 
  meta = with lib; {

    description = "Java Ldap Browser";

    homepage = "https://sourceforge.net/projects/jxplorer/";

    license = lib.licenses.caossl;

    license = lib.licenses.asl11;

    maintainers = with maintainers; [ benwbooth ];

    platforms = platforms.linux;

    mainProgram = "jxplorer";