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

Drop Xfce 4.12 and promote Xfce module and packageset to 4.14 #72800

Merged
merged 10 commits into from
Nov 20, 2019

Conversation

worldofpeace
Copy link
Contributor

@worldofpeace worldofpeace commented Nov 4, 2019

Motivation for this change

In 19.09 we added a module to interact with Xfce 4.14.
Phase two of my plan for Xfce was to remove the 4.14 subtree and merge it into 4.12.
This means having only one Xfce module that tries to be the latest upstream version and one packageset. This is going to make maintenance a lot simpler and will make contributions more straightforward. In the past, I've noticed people misunderstand where they can contribute their changes for Xfce, what packages to update, why is there multiple sets? Xfce is an important part of nixpkgs and it will need new maintainers as time goes by. I hope to whoever picks this up formally or returns have a straightforward task at hand.

Details of change

I've ported over all the expressions at xfce4-14 to xfce using mkXfceDerivation.
Existing expressions where there was no counterpart at xfce4-14 have not been rewritten.

In order for me to promote xfce 4.14 I felt the need to support the thunarPlugins interface, so I've synced that patch with upstream and uncommented the code.

Things to check for

To users this change should appear like a normal update and it shouldn't require any immediate changes.
.
Specifically users who have configurations using

services.xserver.desktopManager.xfce4-14.enable.*

should get messages from mkRenamedOptionModule because we've renamed everything.

All attributes should be properly aliased, and removed attributes should have throws was informative messages without typographic errors.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Opened as a draft because there will probably be eval errors

Sorry, something went wrong.

@worldofpeace worldofpeace added this to the 20.03 milestone Nov 4, 2019
@worldofpeace
Copy link
Contributor Author

worldofpeace commented Nov 4, 2019

This should hopefully complete most or all of the todos in #68737.

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: xfce The Xfce Desktop Environment 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 4, 2019
@worldofpeace worldofpeace force-pushed the xfce-4.12-drop branch 3 times, most recently from 861f0bb to dfca78a Compare November 5, 2019 23:07
@ofborg ofborg bot added 8.has: clean-up 8.has: package (new) This PR adds a new package labels Nov 6, 2019
@worldofpeace worldofpeace marked this pull request as ready for review November 6, 2019 03:35
@worldofpeace worldofpeace requested review from jtojnar and volth November 6, 2019 03:35
@ofborg ofborg bot added 8.has: changelog 8.has: documentation This PR adds or changes documentation labels Nov 19, 2019
All code that was at xfce4-14 has been moved to xfce/*.
Old expressions that aren't rewritten might be abandoned or broken.

Additonally I've ported the xfce4-14 thunar expression to support
thunarPlugins. We can now support this interface in the Xfce module
again, although I'm not sure if we have any plugins packaged that support
latest thunar.
We want only one xfce module and packageset.
Uneeded with one xfce packageset.
@worldofpeace worldofpeace merged commit a80f1c4 into NixOS:master Nov 20, 2019
@worldofpeace worldofpeace deleted the xfce-4.12-drop branch November 20, 2019 00:19
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Nov 20, 2019
Drop Xfce 4.12 and promote Xfce module and packageset to 4.14

(cherry picked from commit a80f1c4)
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 6.topic: xfce The Xfce Desktop Environment 8.has: changelog 8.has: clean-up 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant