apple/t2: deprecate enableTinyDfr option

NixOS / nixos-hardware

A collection of NixOS modules covering hardware quirks.

Creative Commons Zero v1.0 Universal

2.08k stars 641 forks source link

apple/t2: deprecate enableTinyDfr option #1225

Closed soopyc closed 2 weeks ago

soopyc commented 3 weeks ago

Description of changes

Adds a deprecation warning to hardware.apple-t2.enableTinyDfr as it has been upstreamed to nixpkgs already. The package and option can be removed at the next release cycle to hopefully not break people's setup.
Adds an assertion to conflict hardware.apple-t2.enableTinyDfr with hardware.apple.touchBar. Having both enabled causes both tiny-dfr to fight for the same display device.

Things done

[x] Tested the changes in your own NixOS Configuration
[x] Tested the changes end-to-end by using your fork of nixos-hardware and importing it via <nixos-hardware> or Flake input

soopyc commented 3 weeks ago

hmm, stable tests shouldn't break... i suspect this is due to a bug in the test flake: https://github.com/NixOS/nixos-hardware/blob/master/tests/flake.nix#L65

EDIT: see #1226

Mic92 commented 3 weeks ago

@mergify rebase

mergify[bot] commented 3 weeks ago

rebase

✅ Branch has been successfully rebased

soopyc commented 3 weeks ago

should the test flake lockfile also be updated here? tests with the updated lockfile passes except one:

  error: A definition for option `hardware.tuxedo-drivers.enable' is not of type `boolean'. Definition values:
  - In `/nix/store/57c0fgv5xzbn9ck203ivg5bw9fifhg2w-source/nixos/modules/hardware/tuxedo-drivers.nix':
      {
        _type = "override";
        content = true;
        priority = 1000;
      }
...
The following 1 test(s) failed:
 'x86_64-linux.nixos-unstable-tuxedo-aura-15-gen1'

Mic92 commented 2 weeks ago

@soopyc yes. We probably should automate that.

soopyc commented 2 weeks ago

resolved in #1231