Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.

3 files changed, 51 insertions, 26 deletions

diff --git a/pkgs/tools/typesetting/pygmentex/default.nix b/pkgs/tools/typesetting/pygmentex/default.nix
new file mode 100644
index 00000000000..da029639c3d
--- /dev/null
+++ b/pkgs/tools/typesetting/pygmentex/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchzip, python2Packages }:
+
+python2Packages.buildPythonApplication rec {
+  name = "pygmentex-${version}";
+  version = "0.8";
+
+  src = fetchzip {
+      url = "http://mirrors.ctan.org/macros/latex/contrib/pygmentex.zip";
+      sha256 = "1nm19pvhlv51mv2sdankndhw64ys9r7ch6szzd6i4jz8zr86kn9v";
+  };
+
+  pythonPath = [ python2Packages.pygments python2Packages.chardet ];
+
+  buildPhase = ":";
+  
+  doCheck = false;
+  
+  installPhase = ''
+  
+    mkdir -p $out/bin
+    cp -a pygmentex.py $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://www.ctan.org/pkg/pygmentex;
+    description = "Auxiliary tool for typesetting code listings in LaTeX documents using Pygments";
+    longDescription = ''
+      PygmenTeX is a Python-based LaTeX package that can be used for
+      typesetting code listings in a LaTeX document using Pygments.
+
+      Pygments is a generic syntax highlighter for general use in all kinds of
+      software such as forum systems, wikis or other applications that need to
+      prettify source code.
+
+      This package installs just the script needed to process code listings
+      snippets extracted from the a LaTeX document by the pygmentex LaTeX
+      package. In order to use it effectivelly the texlive package pygmentex
+      also has to be installed. This can be done by adding pygmentex to
+      texlive.combine.
+    '';
+    license = licenses.lppl13c;
+    maintainers = with maintainers; [ romildo ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix
index 5cd5515400d..ce5c025475a 100644
--- a/pkgs/tools/typesetting/tex/nix/default.nix
+++ b/pkgs/tools/typesetting/tex/nix/default.nix
@@ -17,7 +17,9 @@ rec {
     assert generatePDF -> !generatePS;
 
     let
-      tex = pkgs.texlive.combine texPackages;
+      tex = pkgs.texlive.combine
+        # always include basic stuff you need for LaTeX
+        ({inherit (pkgs.texlive) scheme-basic;} // texPackages);
     in
 
     pkgs.stdenv.mkDerivation {
diff --git a/pkgs/tools/typesetting/tex/texlive-new/default.nix b/pkgs/tools/typesetting/tex/texlive-new/default.nix
index 5fe52ba07ba..fbf4adde2ae 100644
--- a/pkgs/tools/typesetting/tex/texlive-new/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive-new/default.nix
@@ -1,29 +1,7 @@
-/* (new) TeX Live user docs
-  - Basic usage: just pull texlive.combined.scheme-basic
-  for an environment with basic LaTeX support.
-  There are all the schemes as defined upstream (with tiny differences, perhaps).
-  - You can compose your own collection like this:
-    texlive.combine {
-      inherit (texlive) scheme-small collection-langkorean algorithms cm-super;
-    }
-  - By default you only get executables and files needed during runtime,
-  and a little documentation for the core packages.
-  To change that, you need to add `pkgFilter` function to `combine`.
-    texlive.combine {
-      # inherit (texlive) whatever-you-want;
-      pkgFilter = pkg:
-        pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "cm-super";
-     # elem tlType [ "run" "bin" "doc" "source" ]
-     # there are also other attributes: version, name
-    }
-  - Known bugs:
-    * some tools are still missing, e.g. luajittex
-    * some apps aren't packaged/tested yet (xdvi, asymptote, biber, etc.)
-    * feature/bug: when a package is rejected by pkgFilter,
-      its dependencies are still propagated
-    * in case of any bugs or feature requests, file a github issue and /cc @vcunat
+/* TeX Live user docs
+  - source: ../../../../../doc/languages-frameworks/texlive.xml
+  - current html: http://nixos.org/nixpkgs/manual/#sec-language-texlive
 */
-
 { stdenv, lib, fetchurl, runCommand, writeText, buildEnv
 , callPackage, ghostscriptX, harfbuzz, poppler_min
 , makeWrapper, perl, python, ruby