gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib.licenses: caossl rename to asl11

Browse Source 
This is just the Apache-1.1 license so make use of it and not some random name
This commit is contained in:
jopejoe1
2025-09-01 19:28:03 +02:00
parent e85bfdae29
commit 7e3c021be1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/licenses.nix
View File

@@ -152,6 +152,11 @@ lib.mapAttrs mkLicense (
fullName = "Artistic License 2.0"; fullName = "Artistic License 2.0";
}; };
asl11 = {
spdxId = "Apache-1.1";
fullName = "Apache License 1.1";
};
asl20 = { asl20 = {
spdxId = "Apache-2.0"; spdxId = "Apache-2.0";
fullName = "Apache License 2.0"; fullName = "Apache License 2.0";
@@ -274,11 +279,6 @@ lib.mapAttrs mkLicense (
redistributable = true; redistributable = true;
}; };
caossl = {
fullName = "Computer Associates Open Source Licence Version 1.0";
url = "http://jxplorer.org/licence.html";
};
cal10 = { cal10 = {
spdxId = "CAL-1.0"; spdxId = "CAL-1.0";
fullName = "Cryptographic Autonomy License version 1.0 (CAL-1.0)"; fullName = "Cryptographic Autonomy License version 1.0 (CAL-1.0)";

2
pkgs/by-name/jx/jxplorer/package.nix
View File

@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Java Ldap Browser"; description = "Java Ldap Browser";
homepage = "https://sourceforge.net/projects/jxplorer/"; homepage = "https://sourceforge.net/projects/jxplorer/";
license = lib.licenses.caossl; license = lib.licenses.asl11;
maintainers = with maintainers; [ benwbooth ]; maintainers = with maintainers; [ benwbooth ];
platforms = platforms.linux; platforms = platforms.linux;
mainProgram = "jxplorer"; mainProgram = "jxplorer";