Skip to content

Commit ad0531d

Browse files
author
Matthias Koeppe
committed
src/doc/bootstrap, src/doc/en/installation: Add voidlinux package lists
1 parent 7d52f9e commit ad0531d

File tree

3 files changed

+36
-13
lines changed

3 files changed

+36
-13
lines changed

src/doc/bootstrap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ shopt -s extglob
2727
RECOMMENDED_SPKG_PATTERN="@(_recommended$(for a in $(head -n 1 build/pkgs/_recommended/dependencies); do echo -n "|"$a; done))"
2828
DEVELOP_SPKG_PATTERN="@(_develop$(for a in $(head -n 1 build/pkgs/_develop/dependencies); do echo -n "|"$a; done))"
2929

30-
for SYSTEM in arch debian fedora homebrew opensuse; do
30+
for SYSTEM in arch debian fedora homebrew opensuse void; do
3131
SYSTEM_PACKAGES=
3232
OPTIONAL_SYSTEM_PACKAGES=
3333
SAGELIB_SYSTEM_PACKAGES=

src/doc/en/installation/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Linux
117117
distribution, consider upgrading your distribution.
118118
In particular, do not install a version of Sage older than 9.2.
119119

120-
- **No root access, or on an older distribution** Install SageMath from
120+
- **No root access, or on an older distribution:** Install SageMath from
121121
the `conda-forge <https://conda-forge.org/>`_ project, as described in section
122122
:ref:`sec-installation-conda`.
123123

src/doc/en/installation/source.rst

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ installed by Sage.
7777
When the ``./configure`` script runs, it will check for the presence of many
7878
packages (including the above) and inform you of any that are
7979
missing or have unsuitable versions. **Please read the messages that
80-
``./configure`` prints:** It will inform you which additional system packages
80+
./configure prints:** It will inform you which additional system packages
8181
you can install to avoid having to build them from source. This can save a lot of
8282
time.
8383

@@ -183,6 +183,29 @@ install:
183183

184184
.. literalinclude:: opensuse-optional.txt
185185

186+
Void Linux package installation
187+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
188+
189+
On Void Linux, we recommend that you install:
190+
191+
.. literalinclude:: void.txt
192+
193+
If you wish to do Sage development, we recommend that you additionally
194+
install the following:
195+
196+
.. literalinclude:: void-develop.txt
197+
198+
For all users, we recommend that you install the following system packages,
199+
which provide additional functionality and cannot be installed by Sage:
200+
201+
.. literalinclude:: void-recommended.txt
202+
203+
In addition to these, if you don't want Sage to build optional packages that might
204+
be available from your OS, cf. the growing list of such packages on :trac:`27330`,
205+
install:
206+
207+
.. literalinclude:: void-optional.txt
208+
186209
.. _section_macprereqs:
187210

188211
macOS prerequisites
@@ -275,8 +298,8 @@ Sage can be installed onto Linux running on Windows Subsystem for Linux (WSL). T
275298
From this point on, follow the instructions in the :ref:`sec-installation-from-sources-linux-recommended-installation` section.
276299
It is strongly recommended to put the Sage source files in the Linux file system, for example, in the ``/home/username/sage`` directory, and not in the Windows file system (e.g. ``/mnt/c/...``).
277300

278-
WSL permission denied error when building `packaging` package.
279-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
301+
WSL permission denied error when building ``packaging`` package
302+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
280303

281304
You may encounter permission errors of the kind ``"[Errno 13] Permission denied: 'build/bdist.linux-x86_64/wheel/<package>.dist-info'"`` during ``make``.
282305
This usually comes from a permission conflict between the Windows and Linux file system.
@@ -305,19 +328,19 @@ Notes on using conda
305328

306329
If you don't want conda to be used by sage, deactivate conda (for the current shell session).
307330

308-
- Type::
331+
- Type::
309332

310-
$ conda deactivate
333+
$ conda deactivate
311334

312-
- Repeat the command until ``conda info`` shows::
335+
- Repeat the command until ``conda info`` shows::
313336

314-
$ conda info
337+
$ conda info
315338

316-
active environment : None
317-
...
339+
active environment : None
340+
...
318341

319-
Then SageMath will be built either using the compilers provided by the
320-
operating system, or its own compilers.
342+
Then SageMath will be built either using the compilers provided by the
343+
operating system, or its own compilers.
321344

322345

323346
Tcl/Tk (and system's Python)

0 commit comments

Comments
 (0)