diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
| commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
| tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /gnu/packages/text-editors.scm | |
| parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
| parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
| download | guix-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar guix-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/algebra.scm
gnu/packages/bioinformatics.scm
gnu/packages/curl.scm
gnu/packages/docbook.scm
gnu/packages/emacs-xyz.scm
gnu/packages/maths.scm
gnu/packages/plotutils.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/readline.scm
gnu/packages/tls.scm
gnu/packages/xml.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/text-editors.scm')
| -rw-r--r-- | gnu/packages/text-editors.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index b63aa3b253..426a15853d 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -524,13 +524,14 @@ OpenBSD team.") #t))) (add-after 'install 'install-extra-documentation ;; Install sample configuration file, Info, and HTML manual. - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) (let* ((share (string-append (assoc-ref outputs "out") "/share")) (doc (string-append share "/doc/" ,name "-" ,version)) (html (string-append share "/html")) (info (string-append share "/info")) - (makeinfo (string-append (assoc-ref %build-inputs "texinfo") - "/bin/makeinfo"))) + (makeinfo (string-append + (assoc-ref (or native-inputs inputs) "texinfo") + "/bin/makeinfo"))) ;; First fix Texinfo documentation, create appropriate ;; directories, then generate Info and HTML files there. (substitute* "qe-doc.texi" @@ -807,14 +808,14 @@ editors.") (define-public texmacs (package (name "texmacs") - (version "1.99.20") + (version "1.99.21") (source (origin (method url-fetch) (uri (string-append "https://www.texmacs.org/Download/ftp/tmftp/" "source/TeXmacs-" version "-src.tar.gz")) (sha256 - (base32 "0wny36qsgzpp084h2i85rd3l8fq1q69sglc266prb06ygcb0iyia")))) + (base32 "0zmm8212cha22dp1xablj1h4anlnyhjh09n13ckqf6ppb1bkf4gm")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) |