Commit graph

80 commits

Author SHA1 Message Date
Isaac van Bakel
9734a6a1fe
nongnu: nvidia-nvml: Fix baked-in source in unpack overrides.
* nongnu/packages/nvidia.scm (nvidia-nvml)[#:phases]<unpack>: Replace source
G-expression by keyword argument source.

These cases of `replace 'unpack` were referring to the `#$source` of the
package in the g-exp, which was baking in the source *at the point of
package definition* to the g-exp. This prevented inheritor packages from
modifying the source field and getting the expected effect.

The correct way to refer to the source field from a phase override is
with the `source` key. This modifies all the references to `#$source` I
could find in `unpack` phase replacements.

Signed-off-by: Jelle Licht <jlicht@fsfe.org>
2024-11-03 13:05:26 +01:00
Hilton Chain
fc5e2c7cb6
nongnu: nvidia-driver: Update to 550.120.
* nongnu/packages/nvidia.scm (nvidia-version): Update to 550.120.
(%nvidia-driver-hashes,%nvidia-settings-hashes): Update hash.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-09-22 15:15:31 -04:00
Hilton Chain
74b354fc26
nongnu: nvidia: Separate hash storage.
* nongnu/packages/nvidia.scm (%nvidia-driver-hashes,%nvidia-settings-hashes):
New variables.
(nvidia-source,nvidia-settings): Use them.
(nvidia-source-hash): Delete procedure.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-09-22 15:15:29 -04:00
Hilton Chain
3dca585034
nongnu: nvidia-driver: Update to 550.67.
* nongnu/packages/nvidia.scm (nvidia-version): Update to 550.67.
(nvidia-source-hash)[%nvidia-source-hashes]: Update hashes.
(make-nvidia-source): Add zstd to PATH.
(nvidia-source,nvidia-settings): Update hash.
(nvidia-driver)[inputs]: Add openssl, openssl-1.1
[arguments]<#:phases>: Add them to RUNPATH.
Install nvidia-cuda-mps-control and nvidia-cuda-mps-server.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:59 -04:00
Hilton Chain
39e64b2b77
nongnu: nvda: Update synopsis and description.
* nongnu/packages/nvidia.scm (nvda)[synopsis,description]: Update.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:56 -04:00
Hilton Chain
260855dc5e
nongnu: nvidia-module-open: Update synopsis and description.
* nongnu/packages/nvidia.scm (nvidia-module-open): Don't use package/inherit.
[synopsis,description]: Update.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:55 -04:00
Hilton Chain
3e6050eb84
nongnu: nvidia-module: Update synopsis and description.
* nongnu/packages/nvidia.scm (nvidia-module)[synopsis,description]: Update.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:54 -04:00
Hilton Chain
ffe4fe4e6c
nongnu: nvidia-firmware: Update synopsis and description.
* nongnu/packages/nvidia.scm (nvidia-firmware)[synopsis,description]: Update.
[arguments]<#:install-plan>: Use version of ‘this-package’.
[propagated-inputs]: Set to '().

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:52 -04:00
Hilton Chain
b08562d4c9
nongnu: nvidia-driver: Update synopsis and description.
* nongnu/packages/nvidia.scm (nvidia-driver)[synopsis,description]: Update.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:51 -04:00
Hilton Chain
d35912bd9e
nongnu: nvidia: Group source hashes.
* nongnu/packages/nvidia.scm (nvidia-source-hash): New procedure.
(nvidia-source): Use it.
(nvidia-settings)[source]: Likewise.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:50 -04:00
Hilton Chain
deab71dbe6
nongnu: nvidia-driver: Remove libraries provided by libglvnd.
* nongnu/packages/nvidia.scm (nvidia-source-unbundle-libraries): Remove
libraries provided by libglvnd.
(nvidia-driver)[inputs]: Add libglvnd-for-nvda.
[arguments]<#:phases>: Add it to RUNPATH.
(nvda)[arguments]<#:builder>: Add "libglvnd" from inputs to union build.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:43 -04:00
Hilton Chain
fbf5024faf
nongnu: Add mesa-for-nvda.
* nongnu/packages/nvidia.scm (mesa-for-nvda): New variable.
(nvda)[version,inputs]: Replace mesa with it.
[arguments]<#:builder>: Remove resolve-collision procedure.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:42 -04:00
Hilton Chain
8c1a56e16e
nongnu: Add libglvnd-for-nvda.
* nongnu/packages/nvidia.scm (libglvnd-for-nvda): New variable.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:40 -04:00
Hilton Chain
357888aa25
nongnu: nvda: Adjust package style.
* nongnu/packages/nvidia.scm (nvda)[arguments]<#:builder>: Adjust style.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:39 -04:00
Hilton Chain
74fa6e1916
nongnu: nvda: Adjust inputs.
* nongnu/packages/nvidia.scm (nvda)[native-inputs]: Set to '().
[propagated-inputs]: Propagate mesa and nvidia-drivers's propagated-inputs.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:37 -04:00
Hilton Chain
57c915ac9e
nongnu: nvda: Add native-search-paths.
* nongnu/packages/nvidia.scm (nvda): Add native-search-paths.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:36 -04:00
Hilton Chain
b0ebc7cb24
nongnu: nvda: Pad version to the length of mesa version.
* nongnu/packages/nvidia.scm (nvda)[version]: Pad to the length of mesa version.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:34 -04:00
Hilton Chain
2ae8a04b57
nongnu: nvidia-settings: Install desktop file.
* nongnu/packages/nvidia.scm (nvidia-settings)[arguments]<#:phases>:
Add 'install-desktop-file.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:33 -04:00
Hilton Chain
5fab8f4967
nongnu: nvidia-settings: Fix application profile path.
* nongnu/packages/nvidia.scm (nvidia-settings)[arguments]<#:phases>:
Add 'fix-application-profile-path.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:31 -04:00
Hilton Chain
54d01560e9
nongnu: nvidia-settings: Unbundle jansson.
* nongnu/packages/nvidia.scm (nvidia-settings) [inputs]: Add jansson.
[source]<snippet>: Delete bundled jansson.
[arguments]<#:make-flags>: Don't use bundled jansson.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:30 -04:00
Hilton Chain
f6c8eb082c
nongnu: nvidia-driver: Add architecture to configuration filenames.
* nongnu/packages/nvidia.scm (nvidia-driver)[arguments]<#:phases>: Add
architecture to configuration filenames.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:28 -04:00
Hilton Chain
d59c557f79
nongnu: nvidia-driver: Install EGL vendor ICD configuration.
* nongnu/packages/nvidia.scm (nvidia-driver)[arguments]<#:install-plan>: Install
EGL vendor ICD configuration.
<#:phases>: Modify its library path.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:27 -04:00
Hilton Chain
0ae85eb25e
nongnu: nvidia-driver: Install GBM and VDPAU library to correct path.
* nongnu/packages/nvidia.scm (nvidia-driver)[arguments]<#:phases>: Install GBM
and VDPAU library to correct path.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:25 -04:00
Hilton Chain
732cce2c90
nongnu: nvidia-driver: Update udev rules.
* nongnu/packages/nvidia.scm (%nvidia-script-create-device-nodes)
(%nvidia-udev-rules): New variables.
(nvidia-driver)[arguments]<#:modules,#:phases>: Adjust accordingly.
[inputs]: Remove bash-minimal, coreutils, grep.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:24 -04:00
Hilton Chain
c05b4995ab
nongnu: nvidia-driver: Unbundle EGL external platform libraries.
* nongnu/packages/nvidia.scm (nvidia-source-unbundle-libraries): Remove egl-gbm
and egl-wayland libraries.
(nvidia-driver)[inputs]: Add egl-gbm, egl-wayland.
Remove mesa.
[arguments]<#:phases>: Use them for configuration.
Adjust RUNPATH accordingly.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:22 -04:00
Hilton Chain
5b0465cf31
nongnu: nvidia-driver: Adjust package style.
* nongnu/packages/nvidia.scm (nvidia-driver)[arguments]<#:phases>:
Remove $ORIGIN from RUNPATH.
Ungexp properly.
Rewrite configuration substitution.
Rename phase ‘install-nvidia-smi’ to ‘install-commands’.
Relocate libraries in a separate phase.
Remove extra spaces.
<#:install-plan>: Adjust accordingly.
[description]: Remove final newline.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:21 -04:00
Hilton Chain
2b4dfe83e9
nongnu: nvidia-driver: Remove kernel module dependencies.
* nongnu/packages/nvidia.scm (nvidia-driver)[inputs]: Remove kmod, linux-lts.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:19 -04:00
Hilton Chain
7006d54c47
nongnu: nvidia-driver: Remove library provided by opencl-icd-loader.
* nongnu/packages/nvidia.scm (nvidia-source-unbundle-libraries): Remove library
provided by opencl-icd-loader.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:18 -04:00
Hilton Chain
99e12e9cbe
nongnu: nvidia-driver: Remove libraries provided by nvidia-settings.
* nongnu/packages/nvidia.scm (nvidia-source-unbundle-libraries): Remove
libraries provided by nvidia-settings.
(nvidia-driver)[arguments]<#:phases>: Remove their dependencies from RUNPATH.
[inputs]: Remove atk, cairo, gdk-pixbuf, glib, gtk+, gtk+-2, pango.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:16 -04:00
Hilton Chain
4bc11de5dd
nongnu: make-nvidia-source: Extend functionality.
* nongnu/packages/nvidia.scm (nvidia-source-unbundle-libraries): New procedure.
(make-nvidia-source): Create installer origin internally.
Accept a ‘get-cleanup-snippet’ procedure.
(nvidia-source): Adjust accordingly.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:15 -04:00
Hilton Chain
5f7dabe418
nongnu: make-nvidia-source: Adjust style.
* nongnu/packages/nvidia.scm (computed-origin-method): Delete from top-level.
(make-nvidia-source): Use ungexp-native only once.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:13 -04:00
Hilton Chain
47941b0a84
nongnu: nvidia: Re-order variables.
* nongnu/packages/nvidia.scm: Remove unused modules.
Add comments to group NVIDIA driver packages.
Sort other packages alphabetically.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-04-24 20:06:11 -04:00
Hilton Chain
825f6ee783
nongnu: game-client: Preserve environment variables for NVIDIA driver.
* nongnu/packages/nvidia.scm (%nvidia-environment-variable-regexps): New
variable.
* nongnu/packages/game-client.scm (steam-nvidia-container)
(heroic-nvidia-container): Use it.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
2024-03-22 21:08:33 -04:00
Pierre Langlois
91be26a9d5
nongnu: nvidia-driver: Fix non-x86 builds.
This is needed to fix `guix pull' on non-x86 platforms.

* nongnu/packages/nvidia.scm (nvidia-driver)[arguments]: Add catch-all for
match install-plan.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2023-06-26 23:36:12 +02:00
Sughosha
69b05a57ee
nongnu: nvidia-driver: Support "i686-linux" system.
* nongnu/packages/nvidia.scm (nvidia-driver): Support "i686-linux" system.

Signed-off-by: ison <ison@airmail.cc>
2023-06-21 16:30:27 -06:00
Petr Hodina
29d63cbac7
nongnu: Add nvidia-system-monitor.
* nongnu/packages/nvidia.scm (nvidia-system-monitor): New variable.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2023-02-04 12:31:46 +01:00
Petr Hodina
5bdf006aba
nongnu: Add python-py3nvml.
* nongnu/packages/nvidia.scm (python-py3nvml): New variable.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2023-02-04 12:21:53 +01:00
Petr Hodina
432b14520f
nongnu: Add nvidia-htop.
* nongnu/packages/nvidia.scm (nvidia-htop): New variable.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2023-02-04 12:21:41 +01:00
Petr Hodina
0942612f0f
nongnu: Add gpustat.
* nongnu/packages/nvidia.scm (gpustat): New variable.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2023-02-04 12:21:35 +01:00
Petr Hodina
f59c9ad665
nongnu: Add python-nvidia-ml-py.
* nongnu/packages/nvidia.scm (python-nvidia-ml-py): New variable.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2023-02-04 12:21:31 +01:00
Jonathan Brielmaier
62a5df4222
*.scm: Use SPDX license identifiers.
Fixes https://gitlab.com/nonguix/nonguix/-/issues/224

* *.scm: Use SPDX license identifier and remove obsolete license
statement.
2022-12-19 17:17:39 +01:00
Hilton Chain
7d4c49eace
nongnu: nversion: Remove variable.
* nongnu/packages/nvidia.scm (nversion): Remove variable.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-12-18 14:44:08 +01:00
Hilton Chain
618c7e26eb
nongnu: nvidia-module-open: Use nvidia-module as base.
* nongnu/packages/nvidia.scm (nvidia-module-open): Use nvidia-module as base.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-12-18 14:39:58 +01:00
Hilton Chain
8a4fef778c
nongnu: nvidia-source: Update to 515.76.
* nongnu/packages/nvidia.scm (nvidia-version, nvidia-driver,nvidia-settings): Update to 515.76
[arguments]<#:phases>: Install GBM EGL external platform library.
[inputs]: Add libdrm and mesa.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-12-18 14:32:11 +01:00
Hilton Chain
12104c6ed1
nongnu: nvidia-libs: Remove package.
* nongnu/packages/nvidia.scm (nvidia-libs): Remove package definition and deprecate the variable.

Co-authored-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-12-18 14:19:59 +01:00
Hilton Chain
4ce327023f
nongnu: nvda: Use nvidia-driver as base.
* nongnu/packages/nvidia.scm (nvda): Use nvidia-driver as base.
[inputs]: Adjusted accordingly.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-12-18 14:13:43 +01:00
Hilton Chain
fb5a3d0e97
nongnu: nvda: Avoid hardcoding inputs.
* nongnu/packages/nvidia.scm (nvda)[arguments]: Avoid hardcoding inputs and
locate them via relative paths instead.
[description]: Adjust style.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-12-18 14:12:42 +01:00
Hilton Chain
6874c66ddc
nongnu: Add nvidia-service-type.
* nongnu/services/nvidia.scm: New file.
(<nvidia-configuration>): New data type.
(nvidia-shepherd-service,nvidia-service-type): New variables.
* nongnu/packages/nvidia.scm (nvidia-driver)[description]: Adjust accordingly.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-12-18 14:10:33 +01:00
Hilton Chain
cbb9b59c11
nongnu: Add nvidia-firmware.
* nongnu/packages/nvidia.scm (nvidia-firmware): New variable.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-12-18 14:05:44 +01:00
Hilton Chain
09b37c490e
nongnu: nvidia-driver: Split post-install phase.
* nongnu/packages/nvidia.scm (nvidia-driver)[arguments]<#:phases>: Split
post-install phase into patch-elf and create-short-name-symlinks phases.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-12-18 14:04:32 +01:00