-
-
Notifications
You must be signed in to change notification settings - Fork 15.3k
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
+506
−2,059
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This should hopefully complete most or all of the todos in #68737. |
861f0bb
to
dfca78a
Compare
cdf565b
to
e8746a6
Compare
88c1d96
to
4153c0f
Compare
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.
7196621
to
0c56d05
Compare
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
toxfce
usingmkXfceDerivation
.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
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
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)Opened as a draft because there will probably be eval errors