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

nixos/exwm: fix services.xserver.windowManager.exwm.enable option #361714

Merged
merged 2 commits into from
Dec 4, 2024

Conversation

stanleyj-edsn
Copy link
Contributor

@stanleyj-edsn stanleyj-edsn commented Dec 4, 2024

Fix: #319541
Fix: #361706

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Dec 4, 2024
@stanleyj-edsn
Copy link
Contributor Author

Needs backport to 24.11 because this is broken in NixOS 24.11

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 4, 2024
@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Dec 4, 2024
@stanleyj-edsn stanleyj-edsn changed the title Fix window manager exwm nixos/exwm: fix services.xserver.windowManager.exwm.enable option Dec 4, 2024
@thiagokokada thiagokokada added the backport staging-24.11 Backport PR automatically label Dec 4, 2024
Copy link
Contributor

@thiagokokada thiagokokada left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code wise looks good, but please squash your commits accordingly to the CONTRIBUTING.md guidelines. You should have only one commit similar to:

nixos/exwm: remove services.xserver.windowManager.exwm.enableDefaultConfig

Fix error: 'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'

Fix: NixOS#361706
@jian-lin jian-lin self-requested a review December 4, 2024 18:42
The default configuration was removed from upstream, see emacs-exwm/exwm#57

Fix: NixOS#319541
Co-authored-by: Lin Jian <[email protected]>
@jian-lin jian-lin force-pushed the fix-window-manager-exwm branch from 1351ea6 to c82bf95 Compare December 4, 2024 18:45
@jian-lin
Copy link
Contributor

jian-lin commented Dec 4, 2024

I took the liberty to remove the mention of enableDefaultConfig in the description of loadScript.

Copy link
Contributor

@jian-lin jian-lin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks.

@jian-lin jian-lin added backport release-24.11 Backport PR automatically and removed backport staging-24.11 Backport PR automatically labels Dec 4, 2024
@jian-lin
Copy link
Contributor

jian-lin commented Dec 4, 2024

I also changed the backport label from staging-24.11 to release-24.11 since this PR does not cause massive rebuilds.

@jian-lin jian-lin merged commit 1f3f155 into NixOS:master Dec 4, 2024
18 of 19 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Dec 4, 2024

Successfully created backport PR for release-24.11:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12. first-time contribution This PR is the author's first one; please be gentle! backport release-24.11 Backport PR automatically
Projects
None yet
4 participants