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

texlive: fix licensing information for doc-only-packages (#239528)

Browse Source 
* licenses: add opubl

* texlive: fix license for npp-for-context and lshort-german

This unbreaks evaluation for `texlive.combine { inherit (texlive) scheme-full;
pkgFilter = (_: true) }`. The problem doesn't manifest for the default pkgFilter
as `npp-for-context` is a doc-only-package (that by the way has recently been
removed from texlive).
This commit is contained in:
apfelkuchen6 2023-06-26 20:31:28 +02:00 committed by GitHub
parent 6a9c15fbfd
commit ba6c229037
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/licenses.nix
View File

@ -873,6 +873,11 @@ in mkLicense lset) ({
fullName = "OpenSSL License";
};
opubl = {
spdxId = "OPUBL-1.0";
fullName = "Open Publication License v1.0";
};
osl2 = {
spdxId = "OSL-2.0";
fullName = "Open Software License 2.0";

6
pkgs/tools/typesetting/tex/texlive/default.nix
View File

@ -49,6 +49,12 @@ let
license = [ "lppl13c" ];
};
# TODO: remove this when updating to texlive-2023, npp-for-context is no longer in texlive
npp-for-context = orig.npp-for-context // {
# tlpdb lists license as "noinfo", but it's gpl3: https://github.com/luigiScarso/context-npp
license = [ "gpl3Only" ];
};
# remove dependency-heavy packages from the basic collections
collection-basic = orig.collection-basic // {
deps = lib.filter (n: n != "metafont" && n != "xdvi") orig.collection-basic.deps;

1
pkgs/tools/typesetting/tex/texlive/tl2nix.sed
View File

@ -58,6 +58,7 @@ $a}
s/"lppl1\.3a"/"lppl13a"/g
s/"lppl1\.3c"/"lppl13c"/g
s/"other-free"/"free"/g
s/"opl"/"opubl"/g
s/"pd"/"publicDomain"/g
s/^catalogue-license (.*)/ license = [ \1 ];/p

2
pkgs/tools/typesetting/tex/texlive/tlpdb.nix
View File

@ -25886,7 +25886,7 @@ lshort-german = {
stripPrefix = 0;
sha512.run = "c937bb8da86a3ef6d428d134903bf8af74a286d644bedfe4766841b2b5234b34e2caed70460ecaf7a1b1dc57f1faf1396435cca7f714f84d75f15acea12e79f8";
sha512.doc = "69cebdd6a1444670a154d5cdd199022f6f1d6612b24b05fc8dc1e9f54a89fb65cda1f545341cd37616dbf6dd94077ccb924bf4b49f1473e45eb0bcd33f5f33a6";
license = [ "opl" ];
license = [ "opubl" ];
version = "3.0c";
};
lshort-italian = {