diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-01 22:21:09 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-01 22:21:09 +0200 |
| commit | 8de4131b2ddd11faa3394cf497484563068c9e7a (patch) | |
| tree | ed4ed9e586c7236f09c109afdd416dac18ba8cc3 /gnu/packages/ocaml.scm | |
| parent | 15406013fe63f2ab238eec2d7a8adbc586806ac8 (diff) | |
| parent | 45b7a8bfda5bde2e2daee4bec0ca092cd719d726 (diff) | |
| download | guix-8de4131b2ddd11faa3394cf497484563068c9e7a.tar.gz guix-8de4131b2ddd11faa3394cf497484563068c9e7a.zip | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/ocaml.scm')
| -rw-r--r-- | gnu/packages/ocaml.scm | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ab0aa0574a..8ff755aea9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1377,8 +1377,7 @@ libpanel, librsvg and quartz.") `(("ocaml" ,ocaml-4.09) ;; For documentation ("ghostscript" ,ghostscript) - ("texlive" ,(texlive-updmap.cfg - (list texlive-fonts-ec texlive-dvips-l3backend))) + ("texlive" ,(texlive-updmap.cfg)) ("hevea" ,hevea) ("lynx" ,lynx) ("which" ,which))) @@ -10239,24 +10238,30 @@ SHA384, SHA512, Blake2b, Blake2s and RIPEMD160.") (name "ocaml-bibtex2html") (version "1.99") (source - (origin - (method url-fetch) - (uri "https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.99.tar.gz") - (sha256 (base32 "07gzrs4lfrkvbn48cgn2gn6c7cx3jsanakkrb2irj0gmjzfxl96j")))) + (origin + (method url-fetch) + (uri (string-append "https://www.lri.fr/~filliatr/ftp/bibtex2html/" + "bibtex2html-" version ".tar.gz")) + (sha256 + (base32 + "07gzrs4lfrkvbn48cgn2gn6c7cx3jsanakkrb2irj0gmjzfxl96j")))) (build-system ocaml-build-system) (arguments - `(#:phases - (modify-phases %standard-phases + (list + #:phases + #~(modify-phases %standard-phases (add-after 'unpack 'patch-/bin/sh (lambda _ (substitute* "configure" (("/bin/sh") (which "bash"))) - (setenv "HOME" (getcwd)) ;; mktexfmt needs writable home directory - #t))))) + ;; mktexfmt needs writable home directory. + (setenv "HOME" (getcwd))))))) (native-inputs - `(("which" ,which) - ("texlive" ,(texlive-updmap.cfg - (list texlive-fonts-ec texlive-preprint - texlive-hyperref texlive-bibtex))))) + (list (texlive-updmap.cfg + (list texlive-infwarerr + texlive-kvoptions + texlive-pdftexcmds + texlive-preprint)) + which)) (propagated-inputs (list hevea)) (home-page "https://www.lri.fr/~filliatr/bibtex2html/") |