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

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

Merged
merged 12 commits into from May 26, 2020

Conversation

@romildo
Copy link
Contributor

romildo commented May 22, 2020

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 force-pushed the romildo:upd.enlightenment branch from d0bf4e6 to 3676aed May 22, 2020
@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
@emilazy
Copy link
Member

emilazy commented May 23, 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. 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 14, 2020
Some dependences are not needed anymore, and there are new dependences.
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.
It is already set in the source code upstream.
- 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.
By default enableParallelBuilding is already enabled when building
with meson.
@romildo romildo force-pushed the romildo:upd.enlightenment branch from 3676aed to fa8bd53 May 24, 2020
@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
19 checks passed
19 checks passed
enlightenment.enlightenment, enlightenment.enlightenment.passthru.tests on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
enlightenment.enlightenment, enlightenment.enlightenment.passthru.tests on aarch64-linux Success
Details
enlightenment.enlightenment, enlightenment.enlightenment.passthru.tests on x86_64-linux Success
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="7add034"; rev="7add03458e6b5be734c288a2e3f8c5a70ef81006"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7add034"; rev="7add03458e6b5be734c288a2e3f8c5a70ef81006"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7add034"; rev="7add03458e6b5be734c288a2e3f8c5a70ef81006"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7add034"; rev="7add03458e6b5be734c288a2e3f8c5a70ef81006"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7add034"; rev="7add03458e6b5be734c288a2e3f8c5a70ef81006"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7add034"; rev="7add03458e6b5be734c288a2e3f8c5a70ef81006"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7add034"; rev="7add03458e6b5be734c288a2e3f8c5a70ef81006"; } ./pkgs/t
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
tests.enlightenment on aarch64-linux Success
Details
tests.enlightenment on x86_64-linux Success
Details
@romildo romildo deleted the romildo:upd.enlightenment branch May 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.