Merge branch 'master' into staging

2018-09-08 22:08:32 +00:00
parent 16650af8c3 fb0e0dcbc6
commit b7bd0561be
311 changed files with 8379 additions and 3004 deletions
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -35,7 +35,7 @@ let

  mkUniquePkgs = pkgs: fastUnique (a: b: a < b) # highlighting hack: >
    # here we deal with those dummy packages needed for hyphenation filtering
-    (map (p: if lib.isDerivation p then builtins.toPath p else "") pkgs);
+    (map (p: if lib.isDerivation p then p.outPath else "") pkgs);

 in buildEnv {
  name = "texlive-${extraName}-${bin.texliveYear}";