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

Jump to bottom

enlightenment.enlightenment: 0.23.1 -> 0.24.0, cleanup and fixes #88603

Merged
merged 12 commits into from May 26, 2020
Merged

enlightenment.enlightenment: 0.23.1 -> 0.24.0, cleanup and fixes #88603

merged 12 commits into from May 26, 2020

Conversation

romildo
Copy link
Contributor

@romildo romildo commented May 22, 2020 •
edited

Motivation for this change

Needs testing.

  • enlightenment.enlightenment: format
  • enlightenment.enlightenment: 0.23.1 -> 0.24.0
  • enlightenment.enlightenment: update dependence list
  • enlightenment.enlightenment: no need to fix edje_cc path
  • enlightenment.enlightenment: provides display manager session
  • nixos/enlightenment: use display manager session packages
  • nixos/enlightenment: no need to explicitly set XDG_MENU_PREFIX
  • nixos/enlightenment: remove some themes and xauth
  • nixos/enlightenment: add ephoto and rage
  • enlightenment.enlightenment: do not explicitly enable parallel building
  • enlightenment.enlightenment: fix setuid wrappers (see also https://github.com/NixOS/nixpkgs/issues
  • nixos/tests/enlightenment: fix some steps in the first time wizard
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 nixpkgs-review --run "nixpkgs-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.

@romildo romildo mentioned this pull request May 22, 2020
Closed
@romildo romildo changed the title enlightenment.enlightenment: 0.23.1 -> 0.24.0 enlightenment.enlightenment: 0.23.1 -> 0.24.0, cleanup and fixes May 22, 2020
@romildo romildo requested review from jtojnar and emilazy May 22, 2020 22:41
@emilazy
Copy link
Member

emilazy commented May 23, 2020 •
edited

Now that there's only one setuid executable, I suggest fixing #87678 by removing enlightenment.suid-exes.patch and manually setting security.wrappers in the module rather than using the existing import-from-derivation. Although the the test doesn't block the channel, there's no reason to unnecessarily prevent it from being able to run on Hydra, and building packages during NixOS system configuration evaluation should generally be avoided where possible.

romildo added 11 commits May 24, 2020 00:22
@romildo
enlightenment.enlightenment: format
c2c7fdf
@romildo
enlightenment.enlightenment: 0.23.1 -> 0.24.0
298d37e
@romildo
enlightenment.enlightenment: update dependence list
4e7552c 
Some dependences are not needed anymore, and there are new dependences.
@romildo
enlightenment.enlightenment: no need to fix edje_cc path
140eb22 
Upstream looks for the edje_cc binary (which is provided by efl) in
the bin subdirectory of the enlightenment package prefix. If not found
it is called without giving a directory (that is, it defaults to
$PATH). Therefore a fix is not needed anymore.
@romildo
enlightenment.enlightenment: provides display manager session
05828a5
@romildo
nixos/enlightenment: use display manager session packages
5a73d92
@romildo
nixos/enlightenment: no need to explicitly set XDG_MENU_PREFIX
b1676e5 
It is already set in the source code upstream.
@romildo
nixos/enlightenment: remove some themes and xauth
9c63222 
- E already comes with a default icon theme
- There are already the gtk default Adwaita themes for gtk2, gtk3 and icons
- Remove gnome-icon-theme (from old gtk2)
- Remove tango-icon-theme
- Remove xauth (used by kdesu), as kdesu is not a componnent of E. If
  really needed it should be added in the system configuration.
@romildo
nixos/enlightenment: add ephoto and rage
182f587
@romildo
enlightenment.enlightenment: do not explicitly enable parallel building
eec1f2a 
By default enableParallelBuilding is already enabled when building
with meson.
@romildo
enlightenment.enlightenment: fix setuid wrappers
fa8bd53
@romildo
Copy link
Contributor Author

romildo commented May 24, 2020

Now that there's only one setuid executable, I suggest fixing #87678 by removing enlightenment.suid-exes.patch and manually setting security.wrappers in the module rather than using the existing import-from-derivation.

@emilazy Is it ok now?

@emilazy
Copy link
Member

emilazy commented May 24, 2020

Looks like the import-from-derivation should be gone now, yep. Let's see what ofborg thinks of it; not sure if ofborg has IFD disabled but it's worth running the test anyway.

@ofborg test enlightenment

@romildo
Copy link
Contributor Author

romildo commented May 25, 2020

@ofborg test enlightenment

@romildo
Copy link
Contributor Author

romildo commented May 25, 2020

@emilazy It seems that ofborg test has passed well.

@romildo romildo merged commit d4fc8a1 into NixOS:master May 26, 2020
@romildo romildo deleted the upd.enlightenment branch May 26, 2020 23:43
@wirew0rm wirew0rm mentioned this pull request Jul 8, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar Awaiting requested review from jtojnar

@emilazy emilazy Awaiting requested review from emilazy

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@romildo @emilazy