diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
commit | 0518ccf5af90017df31c445f52badaff45b6b7cd (patch) | |
tree | f60c912ecd598722d76947f6bd5230955210eb66 /pkgs/tools/typesetting | |
parent | c96407720010658b44dcd2a8801b05879105b9ff (diff) | |
parent | 782a12e450a58b815cd702c65da75855124d1572 (diff) | |
download | nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.gz nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.bz2 nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.lz nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.xz nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.zst nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.zip |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/tools/typesetting')
-rw-r--r-- | pkgs/tools/typesetting/biber/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/pdfgrep/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/disser/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/tex4ht/default.nix | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index efce7d4de812..ffd275069da4 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -33,7 +33,7 @@ buildPerlPackage { meta = { description = "Backend for BibLaTeX"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index e05e4d16a06e..ff3bad12bc52 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "a tool to search text in PDF files"; homepage = http://pdfgrep.sourceforge.net/; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; }; 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 93d33439084a..9790c8a5faca 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; }; } |