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
Member

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
@worldofpeace worldofpeace added this to the 20.03 milestone Nov 4, 2019
@worldofpeace

This comment has been minimized.

Copy link
Member Author

worldofpeace commented Nov 4, 2019

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

@worldofpeace worldofpeace force-pushed the worldofpeace:xfce-4.12-drop branch 3 times, most recently from 861f0bb to dfca78a Nov 5, 2019
@ofborg ofborg bot requested review from romildo, AndersonTorres and abbradar Nov 6, 2019
@worldofpeace worldofpeace force-pushed the worldofpeace:xfce-4.12-drop branch from cdf565b to e8746a6 Nov 6, 2019
@worldofpeace worldofpeace marked this pull request as ready for review Nov 6, 2019
@worldofpeace worldofpeace requested review from jtojnar and volth Nov 6, 2019
@worldofpeace worldofpeace force-pushed the worldofpeace:xfce-4.12-drop branch from 88c1d96 to 4153c0f Nov 19, 2019
worldofpeace added 7 commits Nov 4, 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 force-pushed the worldofpeace:xfce-4.12-drop branch from 7196621 to 0c56d05 Nov 19, 2019
@worldofpeace worldofpeace merged commit a80f1c4 into NixOS:master Nov 20, 2019
16 checks passed
16 checks passed
xfce.thunar-archive-plugin, xfce.thunar-dropbox-plugin, xfce.xfburn, xfce.xfce4-datetime-plugin on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
xfce.thunar-archive-plugin, xfce.thunar-dropbox-plugin, xfce.xfburn, xfce.xfce4-datetime-plugin on aarch64-linux Success
Details
xfce.thunar-archive-plugin, xfce.thunar-dropbox-plugin, xfce.xfburn, xfce.xfce4-datetime-plugin on x86_64-linux Success
Details
@worldofpeace worldofpeace deleted the worldofpeace:xfce-4.12-drop branch Nov 20, 2019
dtzWill added 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
You can’t perform that action at this time.