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.

Sign up for GitHub

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

Jump to bottom

Update nvidia legacy 340 to work with 4.9 and 4.10 kernels #24694

Merged
merged 1 commit into from Apr 16, 2017
Merged

Update nvidia legacy 340 to work with 4.9 and 4.10 kernels #24694

merged 1 commit into from Apr 16, 2017

Conversation

calvertvl
Copy link
Contributor

Motivation for this change

nvidiaLegacy340 was at .101, latest is .102. There are also two patches (from Arch) needed to build and load properly on 4.9 and 4.10 kernels, respectively.

Summary:

  • Old version (340.101) did not build against kernels higher than 4.4 or failed to modprobe
  • New version (unpatched) successfully built against 4.9 but failed to modprobe
  • New version (unpatched) failed to build against 4.10
  • New version when patched built against both 4.9 and 4.10 kernels, and loaded successfully in both cases. It also works for 4.4 kernels.
Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Pinging @vcunat as maintainer.

@aristidb aristidb requested a review from vcunat April 8, 2017 15:55
@calvertvl
Copy link
Contributor Author

Pinging @vcunat for review

@vcunat vcunat self-assigned this Apr 16, 2017
vcunat
vcunat reviewed Apr 16, 2017
View reviewed changes
pkgs/os-specific/linux/nvidia-x11/generic.nix
# from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx
# with datestamps removed
./fs52243.patch
]
Copy link
Member

Choose a reason for hiding this comment

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

I must say I can't see why removing the datestamps matters.

Copy link
Contributor Author

@calvertvl calvertvl Apr 16, 2017 •
edited

Choose a reason for hiding this comment

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

The patch failed to apply otherwise - it couldn't find the matching file because nixos resets datestamps.

EDIT: Otherwise I would've used the patch directly from Arch

Copy link
Member

Choose a reason for hiding this comment

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

Oh, I didn't know the patch program checked such things. fetchpatch should solve such a thing, but let's leave it like it is now, as it's such a tiny patch.

vcunat
vcunat approved these changes Apr 16, 2017
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Looks OK, builds OK.

@vcunat vcunat merged commit 71d8ce6 into NixOS:master Apr 16, 2017
@vcunat
Copy link
Member

vcunat commented Apr 16, 2017

Thanks! I'm sorry it's taken me so long.

@calvertvl calvertvl deleted the update-nvidia-legacy-340_102 branch April 16, 2017 20:17
vcunat pushed a commit that referenced this pull request Apr 16, 2017
@calvertvl @vcunat
nvidia: 340.101 -> 340.102 (#24694)
ebbabab 
(cherry picked from commit 71d8ce6)
It's just maintenance + patches to support newer kernels.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

Assignees

@vcunat vcunat

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@calvertvl @vcunat