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

[20.03] Backport linux latest and testing #91226

Merged
merged 15 commits into from Jun 23, 2020
Merged

[20.03] Backport linux latest and testing #91226

merged 15 commits into from Jun 23, 2020

Conversation

bjornfor
Copy link
Contributor

Motivation for this change

My new laptop needs linux >= 5.7 for graphics support and release-20.03 only has linux <= 5.6. This backports linuxPackages_latest and linuxPackages_testing from master.

This is a much smaller version of #91225, where nothing but the *latest and *testing kernels are being updated, and none of the strictly unneeded configuration changes.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

NeQuissimus and others added 15 commits June 20, 2020 22:36
@NeQuissimus @bjornfor
linux: 5.5-rc7 -> 5.6-rc1
5bc4048 
(cherry picked from commit 25f706b)
@NeQuissimus @bjornfor
linux: 5.6-rc1 -> 5.6-rc2
87a110f 
(cherry picked from commit 3f448f0)
@NeQuissimus @bjornfor
linux: 5.6-rc2 -> 5.6-rc3
7dabe08 
(cherry picked from commit 1e41aa8)
@NeQuissimus @bjornfor
linux: 5.6-rc3 -> 5.6-rc5
3328c69 
(cherry picked from commit cd167a0)
@NeQuissimus @bjornfor
linux: 5.6-rc5 -> 5.6-rc7
61e1b66 
(cherry picked from commit c76bad0)
@thoughtpolice @bjornfor
linux_testing: 5.6-rc7 -> 5.7-rc2
48c7203 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit d403911)
@NeQuissimus @bjornfor
linux: 5.7-rc2 -> 5.7-rc3
760436a 
(cherry picked from commit 61b97c1)
@NeQuissimus @bjornfor
linux: 5.7-rc3 -> 5.7-rc4
392f8e1 
(cherry picked from commit b6456e5)
@NeQuissimus @bjornfor
linux: 5.7-rc4 -> 5.7-rc6
62c2df4 
(cherry picked from commit 8b5a312)
@primeos @bjornfor
linux_5_7: init at 5.7.1
86a9689 
Changes:
- Copied linux-5.7.nix from linux-5.6.nix
- Add linux_5_7 and linuxPackages_5_7
- Update linux_latest to 5.7

Note:
The kernel patch 'kernelPatches.export_kernel_fpu_functions."5.3"' is
still applied as I copied the list from linux_5_7 (vs. linux_testing).
This patch is probably still required for the ZFS performance.

(cherry picked from commit 19b2efb)
@vcunat @bjornfor
linux: fix kernel config options for 5.7
e268676 
(cherry picked from commit bbe7161)
@NeQuissimus @bjornfor
linux: 5.7.1 -> 5.7.2
1bc943e 
(cherry picked from commit fa736e1)
@NeQuissimus @bjornfor
linux: 5.7-rc6 -> 5.8-rc1
1825351 
(cherry picked from commit 5953625)
@NeQuissimus @bjornfor
linux: 5.7.2 -> 5.7.3
979b757 
(cherry picked from commit 4f7e011)
@NeQuissimus @bjornfor
linux: 5.7.3 -> 5.7.4
58f3e7b 
(cherry picked from commit 41bd44e)
@bjornfor bjornfor mentioned this pull request Jun 21, 2020
Closed
10 tasks
@bjornfor
Copy link
Contributor Author

This actually cause some build breakage for users of linuxPackages_latest, since it gets updated from 5.6 to 5.7 (and some modules don't build on that version).

We can undo that and keep linuxPackages_latest pointed at 5.6, even though that's not the latest anymore. But I'm not sure if 1) anyone uses *_latest in the release branch and 2) if it's worth changing since it's easily fixed by doing s/linuxPackages_latest/linuxPackages_5_6/ in the user config.

I'm leaning towards "ship it as is" :-)

vcunat
vcunat approved these changes Jun 22, 2020
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.

I think it's also possible to find precedent for linuxPackages_latest major updates on stable releases.

@vcunat vcunat merged commit b154eba into NixOS:release-20.03 Jun 23, 2020
@bjornfor bjornfor deleted the backport-linux-latest-and-testing-20.03 branch June 24, 2020 07:08
@bjornfor
Copy link
Contributor Author

Thanks!

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

@NeQuissimus NeQuissimus Awaiting requested review from NeQuissimus

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 501-1000 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@bjornfor @vcunat @NeQuissimus @thoughtpolice @primeos