about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--lib/licenses.nix5
-rw-r--r--pkgs/tools/typesetting/tex/texlive/default.nix6
-rw-r--r--pkgs/tools/typesetting/tex/texlive/tl2nix.sed1
-rw-r--r--pkgs/tools/typesetting/tex/texlive/tlpdb.nix2
4 files changed, 13 insertions, 1 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix
index a92e8e0792e5f..8836ab912e631 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -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";
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 6be356f1a00b3..def8b112011c2 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -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;
diff --git a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed
index 82fe0025b5ea3..022ec5c8589b0 100644
--- a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed
+++ b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed
@@ -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
diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb.nix
index 912446bda2c60..eb36837b81866 100644
--- a/pkgs/tools/typesetting/tex/texlive/tlpdb.nix
+++ b/pkgs/tools/typesetting/tex/texlive/tlpdb.nix
@@ -25886,7 +25886,7 @@ lshort-german = {
   stripPrefix = 0;
   sha512.run = "c937bb8da86a3ef6d428d134903bf8af74a286d644bedfe4766841b2b5234b34e2caed70460ecaf7a1b1dc57f1faf1396435cca7f714f84d75f15acea12e79f8";
   sha512.doc = "69cebdd6a1444670a154d5cdd199022f6f1d6612b24b05fc8dc1e9f54a89fb65cda1f545341cd37616dbf6dd94077ccb924bf4b49f1473e45eb0bcd33f5f33a6";
-  license = [ "opl" ];
+  license = [ "opubl" ];
   version = "3.0c";
 };
 lshort-italian = {