Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add configurations for nvidia microarchitectures #1094

Merged
merged 5 commits into from
Sep 3, 2024

Conversation

BCNelson
Copy link
Contributor

And add logic to enable the opensource drivers if the NVIDIA driver package and micro architecture supports it

Things done
  • Tested the changes in your own NixOS Configuration
  • Tested the changes end-to-end by using your fork of nixos-hardware and
    importing it via <nixos-hardware> or Flake input

flake.nix Outdated
Comment on lines 298 to 302
common-gpu-nvidia-ada-lovelace = import ./common/gpu/nvidia/ada-lovelace;
common-gpu-nvidia-ampere = import ./common/gpu/nvidia/ampere;
common-gpu-nvidia-turing = import ./common/gpu/nvidia/turing;
common-gpu-nvidia-pascal = import ./common/gpu/nvidia/pascal;
common-gpu-nvidia-maxwell = import ./common/gpu/nvidia/maxwell;
Copy link
Member

@Mic92 Mic92 Sep 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Making this a public api, would work against #992 a bit. Progress on that has been slow, but we made good progress on https://github.com/numtide/nixos-facter so I would prefer to not expose stuff in the flake.nix, which we later on want to deprecate again. The alternative would be to make this part of NixOS as well...

With that we could than automatically detect what nvidia generation is installed in a machine.

flake.nix Outdated Show resolved Hide resolved
@eg-ayoub
Copy link
Contributor

eg-ayoub commented Sep 1, 2024

I have a small question about this,
considering the configs for other devices would still show an error until they set the architecture,
would it be possible to have a meaningful error message in this case ?
Even if one is integrated into nixpkgs, will it guarantee users will know how to fix the nixos-hardware part properly when making their PRs ?

@Mic92
Copy link
Member

Mic92 commented Sep 2, 2024

It's difficult the way this was implemented in nixpkgs to have such an error message.

Copy link
Contributor

@Lyndeno Lyndeno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add the Pascal dependency to the XPS 9560 while we are at it?

Lyndeno added a commit to Lyndeno/nix-config that referenced this pull request Sep 3, 2024
flake.nix Outdated Show resolved Hide resolved
@Lyndeno
Copy link
Contributor

Lyndeno commented Sep 3, 2024

I have a small question about this, considering the configs for other devices would still show an error until they set the architecture, would it be possible to have a meaningful error message in this case ? Even if one is integrated into nixpkgs, will it guarantee users will know how to fix the nixos-hardware part properly when making their PRs ?

I suggest we add the architecture to each model that uses nvidia before this is merged

@Mic92
Copy link
Member

Mic92 commented Sep 3, 2024

I have a small question about this, considering the configs for other devices would still show an error until they set the architecture, would it be possible to have a meaningful error message in this case ? Even if one is integrated into nixpkgs, will it guarantee users will know how to fix the nixos-hardware part properly when making their PRs ?

I suggest we add the architecture to each model that uses nvidia before this is merged

I think this might be a lot of work for a single person. This is better parallelized after merging.

we don't want to increase the api further.
@Mic92 Mic92 added the merge-queue merge after ci succeeds label Sep 3, 2024
mergify bot added a commit that referenced this pull request Sep 3, 2024
@Lyndeno
Copy link
Contributor

Lyndeno commented Sep 3, 2024

I think this might be a lot of work for a single person. This is better parallelized after merging.

True, I can take a look at affected modules once this is merged.

@mergify mergify bot merged commit 366ddc3 into NixOS:master Sep 3, 2024
4 checks passed
@Mic92
Copy link
Member

Mic92 commented Sep 3, 2024

here is a checklist: #1100

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge-queue merge after ci succeeds
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants