diff options
author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-11-06 00:44:33 +0000 |
---|---|---|
committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-11-06 00:48:16 +0000 |
commit | 007f80c1d0440b89970000b92f78ce76186d99a5 (patch) | |
tree | 4e1b441ae8f3d451ebecde034fd4bc8456286f0c /pkgs/tools/typesetting/tex | |
parent | d91986c24f1abc34b9785d9e4cd6dbe0bf398853 (diff) | |
download | nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.gz nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.bz2 nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.lz nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.xz nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.zst nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.zip |
Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me. Relevant: issue #2999, issue #739
Diffstat (limited to 'pkgs/tools/typesetting/tex')
-rw-r--r-- | pkgs/tools/typesetting/tex/disser/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/tex4ht/default.nix | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/tools/typesetting/tex/disser/default.nix b/pkgs/tools/typesetting/tex/disser/default.nix index 28bcfcd97fe1..cbbc3844fefb 100644 --- a/pkgs/tools/typesetting/tex/disser/default.nix +++ b/pkgs/tools/typesetting/tex/disser/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , unzip, texLive, texLiveCMSuper, texLiveAggregationFun , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["texLive" "texLiveCMSuper" "texLiveAggregationFun"]; buildInputs = map (n: builtins.getAttr n x) @@ -36,7 +36,7 @@ rec { ''; makeFlags = ["DESTDIR=$out/share/texmf-dist"]; - + meta = { description = "Russian PhD thesis LaTeX package"; maintainers = with a.lib.maintainers; @@ -45,7 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux; # platform-independent - license = "free"; # LaTeX Project Public License + license = a.lib.licenses.free; # LaTeX Project Public License }; passthru = { updateInfo = { @@ -53,4 +53,3 @@ rec { }; }; }) x - diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index 69d02a275b34..e3e19d82b4ec 100644 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tug.org/tex4ht/"; description = "a system to convert (La)TeX documents to HTML and various other formats"; - license = "LPPL-1.2"; # LaTeX Project Public License + license = stdenv.lib.licenses.lppl12; }; } |