diff options
author | Danny Milosavljevic <dannym@friendly-machines.com> | 2024-12-12 11:00:19 +0100 |
---|---|---|
committer | Danny Milosavljevic <dannym@friendly-machines.com> | 2024-12-12 11:02:06 +0100 |
commit | d916d3b1568a2def0dfb9089d61f2202db35beb7 (patch) | |
tree | 358b04b940684a90b63740680d087c852898f468 | |
parent | 21905248b46c5b7252d177a17575fd3f31bdc7f4 (diff) | |
download | guix-d916d3b1568a2def0dfb9089d61f2202db35beb7.tar.gz guix-d916d3b1568a2def0dfb9089d61f2202db35beb7.zip |
Revert "gnu: python-mathics-core: Add docs."
This reverts commit 978305639e3c930a539ddd2018bc061716ed8b55 since it was too early.
Change-Id: I934d5bd0de1a895670be44a754e54ca0ab431156
-rw-r--r-- | gnu/packages/maths.scm | 57 | ||||
-rw-r--r-- | gnu/packages/plotutils.scm | 4 |
2 files changed, 6 insertions, 55 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ec2e43c737..60203f82a9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -124,14 +124,13 @@ #:use-module (gnu packages cpp) #:use-module (gnu packages datamash) #:use-module (gnu packages dbm) - #:use-module (gnu packages django) #:use-module (gnu packages documentation) + #:use-module (gnu packages django) #:use-module (gnu packages elf) #:use-module (gnu packages emacs) #:use-module (gnu packages file) #:use-module (gnu packages flex) #:use-module (gnu packages fltk) - #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) @@ -153,7 +152,6 @@ #:use-module (gnu packages llvm) #:use-module (gnu packages logging) #:use-module (gnu packages lua) - #:use-module (gnu packages plotutils) #:use-module (gnu packages gnome) #:use-module (gnu packages guile) #:use-module (gnu packages xorg) @@ -10539,7 +10537,6 @@ the Wolfram language.") (sha256 (base32 "0hhk2qq6swnprf9hliazwi3858sv3b3015g0mnm4ycdk5fsc7y57")))) - (outputs '("out" "doc")) (arguments `(;; <https://github.com/pytest-dev/pytest/pull/10173> is missing .closed #:test-flags '("-s") @@ -10547,11 +10544,6 @@ the Wolfram language.") (modify-phases %standard-phases (add-after 'unpack 'patch-bugs (lambda _ - (substitute* "mathics/doc/latex_doc.py" - (("^NUMBER_RE = .*") - ;; Prevent a match of "-7.0.0" (version number) - ; X"NUMBER_RE = re.compile(r\"([ -])(\d*(?<!\.)\.\d+|\d+\.(?!\.)\d*|\d+)(?![.0123456789])\")\n" - "NUMBER_RE = re.compile(r\"([ -])(\\d*(?<!\\.)\\.\\d+|\\d+\\.(?!\\.)\\d*|\\d+)(?![.0123456789])\")\n")) (substitute* "pyproject.toml" (("\"autoload/\\*.m\",") ;; They forgot to install autoload/rules/*.m @@ -10559,56 +10551,15 @@ the Wolfram language.") ;; Prevent internet access by tests. (substitute* "mathics/builtin/files_io/files.py" (("https://raw.githubusercontent.com/Mathics3/mathics-core/master/README.rst") - (string-append (getcwd) "/README.rst"))) - (substitute* "mathics/docpipeline.py" - ;; Undefined. - (("test_parameters[.]doc_even_if_error") "False")))) - ;; TODO: make latexdoc ; (cd mathics/doc/latex && $(MAKE) doc) - (add-after 'install 'build-docs - (lambda* (#:key inputs outputs #:allow-other-keys) - ; Would fuck up LOCAL_ROOT_DIR: (add-installed-pythonpath inputs outputs) - (setenv "PYTHONPATH" (getcwd)) - (substitute* "mathics/settings.py" - (("^(ROOT_DIR = .*)" _ a) (string-append a "\nimport sys\nprint('XXROOT_DIR', ROOT_DIR, sys.stderr)\n"))) - (setenv "HOME" "/tmp") - (mkdir-p "/tmp/.local/var/mathics") - (setenv "BASH" (which "bash")) - (invoke "make" "latexdoc") - ;; TODO: The other files. - (install-file "mathics/doc/latex/mathics-title.pdf" - (string-append (assoc-ref outputs "doc") "/share/doc/mathics")))) + (string-append (getcwd) "/README.rst"))))) (add-before 'check 'prepare-locales (lambda _ ;; Otherwise 210 tests fail because the real output would use ;; unicode arrow characters. With this, only 18 (symbolic) tests fail. (setenv "MATHICS_CHARACTER_ENCODING" "ASCII")))))) (build-system pyproject-build-system) - (native-inputs (list python-pytest - texlive-xetex - font-latin-modern - (texlive-updmap.cfg - (list asymptote - texlive-latexmk - texlive-koma-script - texlive-gensymb - texlive-newpx - texlive-xstring - texlive-kastrup - texlive-preprint - texlive-listings - texlive-paralist - texlive-breqn - texlive-environ - texlive-colophon - texlive-minitoc - texlive-mlmodern - texlive-palatino - texlive-mathpazo - texlive-pagella-otf - texlive-tex-gyre-math)) - ghostscript - bash)) - (inputs (list llvm asymptote)) + (native-inputs (list python-pytest)) + (inputs (list llvm)) (propagated-inputs (list python-mpmath python-pint python-palettable diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 72faa6c31f..d5b2f0d9fa 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -136,10 +136,10 @@ (guix build emacs-utils)) #:configure-flags #~(list (string-append "--enable-gc=" #$(this-package-input "libgc")) - (string-append "--with-latex=" #$output "/share/texmf-dist/tex/latex") + (string-append "--with-latex=" #$output "/share/texmf/tex/latex") (string-append "--with-context=" #$output - "/share/texmf-dist/tex/context/third")) + "/share/texmf/tex/context/third")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'locate-tirpc |