Skip to content

sway-unwrapped: rename wlroots_0_16 argument to wlroots#237044

Merged
teto merged 3 commits intoNixOS:masterfrom
teto:config-sway-via-attributes
Jun 25, 2023
Merged

sway-unwrapped: rename wlroots_0_16 argument to wlroots#237044
teto merged 3 commits intoNixOS:masterfrom
teto:config-sway-via-attributes

Conversation

@teto
Copy link
Copy Markdown
Member

@teto teto commented Jun 10, 2023

Description of changes

this makes the override of settings possible via overrideAttrs rather than override making the interface easier and also making this possible nix-community/home-manager#4039 i.e., having home-manager configure swayfx in the same way it configures sway.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

@teto teto force-pushed the config-sway-via-attributes branch 2 times, most recently from 6c9f970 to f132a27 Compare June 10, 2023 17:48
@ofborg ofborg bot requested review from Synthetica9 and primeos June 10, 2023 18:07
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jun 10, 2023
@teto teto marked this pull request as ready for review June 10, 2023 21:31
@teto
Copy link
Copy Markdown
Member Author

teto commented Jun 11, 2023

cc @primeos

Copy link
Copy Markdown
Member

@primeos primeos left a comment

Choose a reason for hiding this comment

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

Hm, I'm not entirely convinced on inheriting the "config/override flags" (would be better if we already had a proper mechanism for package configuration flags in Nixpkgs) but I don't really mind so feel free to merge if it helps for your / the home-manager use-case ;)
(But those arguments aren't guaranteed to remain stable so relying on them is a bit dangerous - we try to avoid even such (internal) "breaking" changes to the Sway package though.)

It's a bit unfortunate that we loose the assert but it should be fine.

Comment thread pkgs/applications/window-managers/sway/default.nix Outdated
Comment thread pkgs/applications/window-managers/sway/wrapper.nix Outdated
@teto teto force-pushed the config-sway-via-attributes branch from f132a27 to 3cb718c Compare June 13, 2023 14:07
@ofborg ofborg bot requested a review from primeos June 13, 2023 14:56
Matthieu Coudron added 3 commits June 15, 2023 16:50
it's easier to use overrideAttrs than override IMO, and for the
home-manager module I would like to be able to configure sway forks the same way as
the original sway which is not possible currently see
nix-community/home-manager#4039
@teto teto force-pushed the config-sway-via-attributes branch from 3cb718c to 898559e Compare June 15, 2023 14:52
@teto
Copy link
Copy Markdown
Member Author

teto commented Jun 21, 2023

@primeos gentle ping

@teto teto merged commit a979913 into NixOS:master Jun 25, 2023
@teto teto deleted the config-sway-via-attributes branch June 25, 2023 11:21
@primeos
Copy link
Copy Markdown
Member

primeos commented Jun 26, 2023

Sorry for the delay, my backlog ist too large :(
Merging it was ok ;)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants