Fix(notation): fixed legacy notation for Nix#422
Conversation
adibhanna
left a comment
There was a problem hiding this comment.
Thanks for tackling this, @pimkoter — clearing the xorg.* deprecation warnings is a welcome cleanup. A few things to sort out before it can go in:
1. Please drop / split the unrelated changes. Beyond the notation fix, this PR also does two things I'd like handled separately:
release-data.jsonrewrites"hash"— thefetchFromGitHubsource hash used bypackage-server.nix— for the already-released v2.14.0 (sha256-PdTD3o…→sha256-C+doF2…). That's unrelated to the desktop Xorg fix. If you hit a real source-hash mismatch it's worth its own PR with thenix-prefetch/nix buildoutput so it can be verified; please revert it here.package-desktop.nixdrops the nestedWAYLAND_DISPLAY:+guard on the ozone flag:NIXOS_OZONE_WL:+WAYLAND_DISPLAY:+--ozone-platform-hint=autobecomesNIXOS_OZONE_WL:+…, so the hint is now added wheneverNIXOS_OZONE_WLis set even with no Wayland display. If that's intentional, please call it out and why; otherwise please keep the original guard.
2. Please keep the diff minimal. Most of the 142/133 is a whole-file reformat (indentation, list spacing). Trimming it back to just the ~12 buildInputs renames makes it easy to review and less likely to collide with the per-release edits to this file.
3. Verification. We can't build the Nix packages in CI or locally on our side (no Linux/Nix here), and the desktop derivation is x86_64-linux-only, so we can't confirm the flattened names (libx11, libxscrnsaver, libxtst, …) all resolve on the nixpkgs revision your users pin. Could you paste the output of a successful nix build .#zennotes-desktop plus the nixpkgs rev? That's the main thing standing between this and a merge.
Really appreciate the contribution — scoped down to just the notation rename plus a build log, this should be quick to land.
There were still some old "Xorg.NAME was renamed to X" warnings in ./packaging/nix/package-desktop.nix