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

Jump to bottom

linuxPackages.nvidia_x11_legacy390: use patches from archlinux #62064

Merged
merged 1 commit into from May 27, 2019
Merged

linuxPackages.nvidia_x11_legacy390: use patches from archlinux #62064

merged 1 commit into from May 27, 2019

Conversation

flokli
Copy link
Contributor

@flokli flokli commented May 25, 2019

Those seem to have gotten outdated, and don't build on current kernels
anymore.

Reported in #62012

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@flokli flokli mentioned this pull request May 25, 2019
Closed
@flokli
Copy link
Contributor Author

flokli commented May 25, 2019

It'd be awesome if @vaibhavsagar or somebody else with the hardware could see if this works on both master, and if backported to 19.03.

@vaibhavsagar
Copy link
Member

I don't know how to change my system <nixpkgs> to use this PR, but I can confirm that it correctly builds for me.

@flokli
Copy link
Contributor Author

flokli commented May 26, 2019

@vaibhavsagar While calling nixos-rebuild switch, you can pass a -I nixpkgs=path/to/checkout pointing to a checkout of the nixpkgs repo.

You probably want to checkout the release-19.03 branch and git cherry-pick c2cd3a94e2f1e42beb3203094e8fd261970c557c, as this PR is against the master branch (and you probably don't want to switch your system to unstable)

@vcunat
Copy link
Member

vcunat commented May 26, 2019

You might prefer -I nixpkgs=https://github.com/nixos/nixpkgs/archive/c2cd3a9.tar.gz

vcunat
vcunat reviewed May 26, 2019
View reviewed changes
pkgs/os-specific/linux/nvidia-x11/default.nix
(fetchurl {
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-5.1.patch?h=42d50ef8d6048608d18bdf2c296dd335260c5a1a";
sha256 = "03v46ym2bcckg9q2xrilkg21hfiwypr6gl4jmly2q3m4yza9ja6r";
})];
Copy link
Member

Choose a reason for hiding this comment

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

The file should be deleted, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch didn't apply cleanly anymore. I deleted it now and updated the commit.

I wanted to stick with what archlinux provides, as their patches use #if LINUX_VERSION_CODE < KERNEL_VERSION(…) and seem to apply on recent kernels.

@flokli
linuxPackages.nvidia_x11_legacy390: use patches from archlinux
00263c9 
Those seem to have gotten outdated, and don't build on current kernels
anymore.

Reported-In: NixOS#62012
@flokli flokli force-pushed the linuxPackages.nvidia_x11_legacy390 branch from c2cd3a9 to 00263c9 Compare May 26, 2019 08:58
@flokli
Copy link
Contributor Author

flokli commented May 26, 2019

Maybe -I nixpkgs=https://github.com/flokli/nixpkgs/archive/linuxPackages.nvidia_x11_legacy390.tar.gz

But as I said, this will switch the system to unstable (until next rebuild-switch), so manually cherry-picking might be more suitable.

@vcunat
Copy link
Member

vcunat commented May 26, 2019 •
edited

Hmm, right, I didn't notice 19.03 was wanted. GitHub provides nice git branches for pull requests (by number), but I can't see similar archive URLs.

@vaibhavsagar
Copy link
Member

I manually cherry-picked onto release-19.03 and used that branch for nixos-rebuild and it works great!

@flokli flokli merged commit b301df7 into NixOS:master May 27, 2019
@flokli
Copy link
Contributor Author

flokli commented May 27, 2019

Glad to hear! Merged in and backported to 19.03 in c8124c1.

@flokli flokli deleted the linuxPackages.nvidia_x11_legacy390 branch May 27, 2019 13:11
@vaibhavsagar
Copy link
Member

Thanks so much!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@flokli @vaibhavsagar @vcunat