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

[20.03] Backport linux latest and testing #91226

Merged

Conversation

@bjornfor
Copy link
Contributor

bjornfor commented Jun 21, 2020

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 Feb 13, 2020
(cherry picked from commit 25f706b)
(cherry picked from commit 3f448f0)
(cherry picked from commit 1e41aa8)
(cherry picked from commit cd167a0)
(cherry picked from commit c76bad0)
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit d403911)
(cherry picked from commit 61b97c1)
(cherry picked from commit b6456e5)
(cherry picked from commit 8b5a312)
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)
(cherry picked from commit fa736e1)
(cherry picked from commit 5953625)
(cherry picked from commit 4f7e011)
(cherry picked from commit 41bd44e)
@bjornfor
Copy link
Contributor Author

bjornfor commented Jun 21, 2020

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
Copy link
Member

vcunat left a comment

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
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="58f3e7b"; rev="58f3e7b88fffae060162f6b27b453d7a996b7e9b"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="58f3e7b"; rev="58f3e7b88fffae060162f6b27b453d7a996b7e9b"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="58f3e7b"; rev="58f3e7b88fffae060162f6b27b453d7a996b7e9b"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="58f3e7b"; rev="58f3e7b88fffae060162f6b27b453d7a996b7e9b"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="58f3e7b"; rev="58f3e7b88fffae060162f6b27b453d7a996b7e9b"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="58f3e7b"; rev="58f3e7b88fffae060162f6b27b453d7a996b7e9b"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="58f3e7b"; rev="58f3e7b88fffae060162f6b27b453d7a996b7e9b"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
linux, linux.passthru.tests, linux_5_7, linux_5_7.passthru.tests on aarch64-linux Success
Details
linux, linux.passthru.tests, linux_5_7, linux_5_7.passthru.tests on x86_64-linux Success
Details
@bjornfor bjornfor deleted the bjornfor:backport-linux-latest-and-testing-20.03 branch Jun 24, 2020
@bjornfor
Copy link
Contributor Author

bjornfor commented Jun 24, 2020

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.