latex2html: init at 2016 #21802
Merged
latex2html: init at 2016 #21802
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Mic92
approved these changes
Jan 11, 2017
| version = "2016"; | ||
|
|
||
| src = fetchurl { | ||
| url = http://mirrors.ctan.org/support/latex2html/latex2html-2016.tar.gz; |
There was a problem hiding this comment.
nitpick:
url = "http://mirrors.ctan.org/support/latex2html/latex2html-${version}.tar.gz;"
|
Good call! Thank you. |
yurrriq
force-pushed
the
add/pkgs/tools/misc/latex2html
branch
from
200ab53
to
0b63253
Compare
|
Force pushed with the amended |
|
The build contains spurious leftover to the build directory. Compiling a document to html results in the following error: |
|
@Mic92: I've ticked the "Allow edits from maintainers" box, so feel free to make any changes you see fit. I don't have the time for now. |
yurrriq
force-pushed
the
add/pkgs/tools/misc/latex2html
branch
from
0b63253
to
69a928c
Compare
yurrriq
force-pushed
the
add/pkgs/tools/misc/latex2html
branch
from
69a928c
to
0f40d2d
Compare
I've rebased and force pushed, attempting to address the error @Mic92 mentioned above.diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix
index 48976275cb..596a72ee5a 100644
--- a/pkgs/tools/misc/latex2html/default.nix
+++ b/pkgs/tools/misc/latex2html/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, ghostscript, netpbm, texLive, perl }:
+{ stdenv, fetchurl, makeWrapper
+, ghostscript, netpbm, perl }:
# TODO: withTex
# Ported from Homebrew.
@@ -13,7 +14,9 @@ stdenv.mkDerivation rec {
sha256 = "028k0ypbq94mlhydf1sbqlphlfl2fhmlzhgqq5jjzihfmccbq7db";
};
- buildInputs = [ ghostscript netpbm texLive perl ];
+ buildInputs = [ ghostscript netpbm perl ];
+
+ nativeBuildInputs = [ makeWrapper ];
configurePhase = ''
./configure \
@@ -22,6 +25,12 @@ stdenv.mkDerivation rec {
--with-texpath=$out/share/texmf/tex/latex/html
'';
+ postInstall = ''
+ for p in $out/bin/{latex2html,pstoimg}; do \
+ wrapProgram $p --add-flags '--tmp="''${TMPDIR:-/tmp}"'
+ done
+ '';
+
meta = with stdenv.lib; {
description = "LaTeX-to-HTML translator";
longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a27f47a38..7600887e71 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2646,9 +2646,7 @@ with pkgs;
kindlegen = callPackage ../tools/typesetting/kindlegen { };
- latex2html = callPackage ../tools/misc/latex2html {
- texLive = texlive.combined.scheme-basic;
- };
+ latex2html = callPackage ../tools/misc/latex2html { };
ldapvi = callPackage ../tools/misc/ldapvi { };
Edit: I've also dropped the |
yurrriq
commented
Mar 6, 2017
| homepage = "https://www.ctan.org/pkg/latex2html"; | ||
|
|
||
| license = licenses.gpl2; | ||
| platforms = with platforms; linux ++ darwin; |
There was a problem hiding this comment.
Should this be platforms.all or inherit (perl.meta) platforms?
netpbm.meta.platforms = with stdenv.lib.platforms; linux ++ darwin;
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Add latex2html.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)