linux-testing: default to latest if it is newer #130872

ikervagyok · 2021-07-20T21:45:16Z

Motivation for this change

Testing users probably prefer newer to unstable versions.

Things done

Atemu · 2021-07-21T00:23:54Z

pkgs/top-level/all-packages.nix

+  linuxPackages_testing =
+    if lib.versionAtLeast linux_latest.version pkgs.linux_testing.version
+    then linuxPackages_latest
+    else linuxPackagesFor pkgs.linux_testing;


Suggested change

linuxPackages_testing =

if lib.versionAtLeast linux_latest.version pkgs.linux_testing.version

then linuxPackages_latest

else linuxPackagesFor pkgs.linux_testing;

linuxPackages_testing =

if linux_latest.kernelOlder linux_testing.version

then linuxPackages_latest

else linuxPackagesFor linux_testing;

@Atemu Nice suggestion, didn't know about that function! But I think it should be linux_latest.kernelAtLeast or the arguments need to be flipped.

nix-repl> if linux_latest.kernelAtLeast linux_testing.version then linux_latest.version else linux_testing.version "5.13.3" nix-repl> if linux_latest.kernelOlder linux_testing.version then linux_latest.version else linux_testing.version "5.13-rc6"

Ah yes, didn't actually test.

ikervagyok · 2021-07-21T11:44:19Z

@Atemu is this the solution you wanted?

Atemu

Yeah, please squash those commits though.

ikervagyok · 2021-07-21T15:48:28Z

Sorry, now it's squashed!

Atemu

Um, what about linux_testing though?

It'd probably be better to implement the switch there instead.

ikervagyok · 2021-07-21T17:31:08Z

I thought about it, but I'd like it to still be accessible, but not the default. If that is a wrong assumption, I'll switch it around.

EDIT: I could revert and add a new linux_latest_testing and a linuxPackages_latest_testing. Maybe that would be the better solution. Of course I'm open to better naming ideas.

r-rmcgibbo · 2021-07-21T18:50:45Z

Result of nixpkgs-review pr 130872 at 1ed3a6ef run on aarch64-linux 1

10 packages failed to build:

1 package skipped due to time constraints:

linuxPackages_testing.openafs (linuxPackages_testing.openafs_1_8)

43 packages built successfully:

linuxPackages_testing.acpi_call
linuxPackages_testing.akvcam
linuxPackages_testing.apfs
linuxPackages_testing.batman_adv
linuxPackages_testing.bcc
linuxPackages_testing.can-isotp
linuxPackages_testing.cpupower
linuxPackages_testing.cryptodev
linuxPackages_testing.ddcci-driver
linuxPackages_testing.digimend
linuxPackages_testing.dpdk-kmods
linuxPackages_testing.ena
linuxPackages_testing.fwts-efi-runtime
linuxPackages_testing.gcadapter-oc-kmod
linuxPackages_testing.hid-nintendo
linuxPackages_testing.hyperv-daemons
linuxPackages_testing.jool
linuxPackages_testing.kernel
linuxPackages_testing.lttng-modules
linuxPackages_testing.mba6x_bl
linuxPackages_testing.mbp2018-bridge-drv
linuxPackages_testing.netatop
linuxPackages_testing.oci-seccomp-bpf-hook
linuxPackages_testing.openafs_1_9
linuxPackages_testing.openrazer
linuxPackages_testing.perf
linuxPackages_testing.r8125
linuxPackages_testing.r8168
linuxPackages_testing.rtl8812au
linuxPackages_testing.rtl8821cu
linuxPackages_testing.rtl88x2bu
linuxPackages_testing.rtw88 (linuxPackages_testing.rtlwifi_new)
linuxPackages_testing.rtw89
linuxPackages_testing.stdenv
linuxPackages_testing.systemtap
linuxPackages_testing.tmon
linuxPackages_testing.usbip
linuxPackages_testing.v4l2loopback
linuxPackages_testing.veikk-linux-driver
linuxPackages_testing.vhba
linuxPackages_testing.xmm7360-pci
linuxPackages_testing.xpadneo
linuxPackages_testing.zfs (linuxPackages_testing.zfsStable ,linuxPackages_testing.zfsUnstable)

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement. Does something look off? Please file an issue or reach out on IRC.

Atemu

No, just put it that on _latest aswell. I can't imagine a true use-case where you'd want an RC instead of the released version.

ikervagyok · 2021-07-22T16:53:27Z

No, just put it that on _latest aswell. I can't imagine a true use-case where you'd want an RC instead of the released version.

@Atemu Maybe I'm too tired, but I don't understand, what I should do. Could you rephrase it?

Atemu · 2021-07-22T17:31:29Z

Put the logic in linux_testing instead of linuxPackages.

ikervagyok · 2021-07-28T13:08:31Z

@Atemu wdyt now?
The case split for the version is in linux_testing.
The one in linuxPackages_testing is just to keep the recurseIntoAttrs in the same state as before.

Atemu · 2021-07-29T17:01:46Z

pkgs/top-level/all-packages.nix

+    let linux_testing =
+      callPackage ../os-specific/linux/kernel/linux-testing.nix {
+        kernelPatches = [
+          kernelPatches.bridge_stp_helper
+          kernelPatches.request_key_helper
+        ];
+      };
+    in if linux_latest.kernelAtLeast linux_testing.version
+    then linux_latest
+    else linux_testing;


Creating a new linux_testing in the let statement makes things ambigous. TBH, just do away with the let and inline it.

I renamed it linux_testing_ for the let binding, so it's easier to read and not ambiguous.

To be frank, that's even worse.

Just inline it please.

Looking into it again, I just realised that what I said is stupid: You need to reference _testing in the version check and therefore can't inline it.

pkgs/top-level/all-packages.nix

xaverdh · 2021-10-11T08:09:05Z

I think #98865 is a better approach. It turns out we don't update linux_testing regularly anyway, so ppl are probably better off choosing the version themselves.
If #98865 is merged, we should probably think about either removing the linux_testing attribute, or automatically updating it.
edit: well automatic updating won't work anyway, because some manual work is usually required around kernel configuration

updated for new kernel infra

Closes NixOS#130872

ikervagyok · 2021-11-14T14:13:55Z

closing in favor of #144979

Closes #130872

ofborg bot added 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 11-100 labels Jul 20, 2021

Atemu reviewed Jul 21, 2021

View reviewed changes

Atemu approved these changes Jul 21, 2021

View reviewed changes

ikervagyok force-pushed the kernel-testing branch from 8a7fad0 to 1ed3a6e Compare July 21, 2021 15:47

Atemu requested changes Jul 21, 2021

View reviewed changes

Atemu requested changes Jul 22, 2021

View reviewed changes

ikervagyok force-pushed the kernel-testing branch 2 times, most recently from c1a0ceb to 77044b0 Compare July 26, 2021 11:09

Atemu requested changes Jul 29, 2021

View reviewed changes

ikervagyok force-pushed the kernel-testing branch 2 times, most recently from 9dc5c79 to f0595b3 Compare September 2, 2021 06:52

ofborg bot added 10.rebuild-linux: 1-10 10.rebuild-linux: 1 and removed 10.rebuild-linux: 11-100 labels Sep 2, 2021

linux_testing: let this refer to the latest possible kernel

fd588c8

updated for new kernel infra

ikervagyok force-pushed the kernel-testing branch from f0595b3 to fd588c8 Compare November 4, 2021 20:46

ofborg bot added 10.rebuild-linux: 101-500 and removed 10.rebuild-linux: 1 10.rebuild-linux: 1-10 labels Nov 4, 2021

Atemu mentioned this pull request Nov 7, 2021

kernels: set testing to latest if it's newer #144979

Merged

12 tasks

Atemu added a commit to Atemu/nixpkgs that referenced this pull request Nov 13, 2021

kernels: set testing to latest if it's newer

9aca315

Closes NixOS#130872

ikervagyok closed this Nov 14, 2021

alyssais pushed a commit that referenced this pull request Nov 22, 2021

kernels: set testing to latest if it's newer

92029c1

Closes #130872

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

linux-testing: default to latest if it is newer #130872

linux-testing: default to latest if it is newer #130872

ikervagyok commented Jul 20, 2021

Atemu Jul 21, 2021

ikervagyok Jul 21, 2021

Atemu Jul 21, 2021

ikervagyok commented Jul 21, 2021

Atemu left a comment

ikervagyok commented Jul 21, 2021

Atemu left a comment

ikervagyok commented Jul 21, 2021 •

edited

r-rmcgibbo commented Jul 21, 2021

Atemu left a comment

ikervagyok commented Jul 22, 2021

Atemu commented Jul 22, 2021

ikervagyok commented Jul 28, 2021

Atemu Jul 29, 2021

ikervagyok Sep 2, 2021

Atemu Sep 3, 2021

Atemu Nov 7, 2021

xaverdh commented Oct 11, 2021 •

edited

ikervagyok commented Nov 14, 2021

linux-testing: default to latest if it is newer #130872

linux-testing: default to latest if it is newer #130872

Conversation

ikervagyok commented Jul 20, 2021

Motivation for this change

Things done

Atemu Jul 21, 2021

Choose a reason for hiding this comment

ikervagyok Jul 21, 2021

Choose a reason for hiding this comment

Atemu Jul 21, 2021

Choose a reason for hiding this comment

ikervagyok commented Jul 21, 2021

Atemu left a comment

Choose a reason for hiding this comment

ikervagyok commented Jul 21, 2021

Atemu left a comment

Choose a reason for hiding this comment

ikervagyok commented Jul 21, 2021 • edited

r-rmcgibbo commented Jul 21, 2021

Atemu left a comment

Choose a reason for hiding this comment

ikervagyok commented Jul 22, 2021

Atemu commented Jul 22, 2021

ikervagyok commented Jul 28, 2021

Atemu Jul 29, 2021

Choose a reason for hiding this comment

ikervagyok Sep 2, 2021

Choose a reason for hiding this comment

Atemu Sep 3, 2021

Choose a reason for hiding this comment

Atemu Nov 7, 2021

Choose a reason for hiding this comment

xaverdh commented Oct 11, 2021 • edited

ikervagyok commented Nov 14, 2021

ikervagyok commented Jul 21, 2021 •

edited

xaverdh commented Oct 11, 2021 •

edited