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: 0.21.10 -> 0.22.0 #31532

Merged
merged 1 commit into from Nov 13, 2017
Merged

enlightenment: 0.21.10 -> 0.22.0 #31532

merged 1 commit into from Nov 13, 2017

Conversation

romildo
Copy link
Contributor

@romildo romildo commented Nov 11, 2017

Motivation for this change
  • Update to version 0.22.0
  • Switch build tools from autotools to meson
  • Change handling of setuid programs
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@grahamc
Copy link
Member

grahamc commented Nov 11, 2017

@GrahamcOfBorg enlightenment

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failure for system: x86_64-linux

error: getting status of ‘/home/grahamc/.nix-test-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/31532/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch’: No such file or directory
(use ‘--show-trace’ to show detailed location information)

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failure for system: x86_64-darwin

error: Package ‘econnman-1.1’ in /tmp/nix-ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/31532/pkgs/desktops/enlightenment/econnman.nix:24 is not supported on ‘x86_64-darwin’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

# enlightenment programs, the file $out/e-wrappers.nix is created,
# containing the needed configuration for that purpose. It can be
# used in the enlightenment module.
patches = [ ./enlightenment.suid-exes.patch ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this patch wasn't added.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact I have forgot to add the patch.

@grahamc
Copy link
Member

grahamc commented Nov 12, 2017

@GrahamcOfBorg build enlightenment

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Success for system: x86_64-linux

stripping (with flags -S) in /nix/store/26103099wy4xhc69yy9bg56i82qaddhx-enlightenment-0.22.0/lib  /nix/store/26103099wy4xhc69yy9bg56i82qaddhx-enlightenment-0.22.0/bin 
patching script interpreter paths in /nix/store/26103099wy4xhc69yy9bg56i82qaddhx-enlightenment-0.22.0
/nix/store/26103099wy4xhc69yy9bg56i82qaddhx-enlightenment-0.22.0/bin/enlightenment_remote: interpreter directive changed from "/bin/sh" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/sh"
checking for references to /tmp/nix-build-enlightenment-0.22.0.drv-0 in /nix/store/26103099wy4xhc69yy9bg56i82qaddhx-enlightenment-0.22.0...
/nix/store/k71xrbdx754c6885x7wyjj67wvwhh1ck-econnman-1.1
/nix/store/xblgndx58yhg2yq15qwylpfa1fis2zg5-efl-1.20.5
/nix/store/26103099wy4xhc69yy9bg56i82qaddhx-enlightenment-0.22.0
/nix/store/nxaggb7jpsglqih16ymwhpbpm3fqblys-ephoto-1.5
/nix/store/r79iwk5cy4lyh5pcy2wc6r98ri2wf488-rage-0.2.1
/nix/store/sm8c42f3ydjjn8bah8x5k4f52v5y6lnl-terminology-1.1.1

Copy link
Member

@disassembler disassembler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this looks good. Can you please squash the commits into a single commit?

@romildo
Copy link
Contributor Author

romildo commented Nov 12, 2017

@disassembler Squash of the commits into a single commit done.

ln -sv $CPUFREQ_DIRPATH/e_freqset $out/bin/e_freqset
ln -sv /run/wrappers/bin/e_freqset $CPUFREQ_DIRPATH/freqset
'';

meta = with stdenv.lib; {
description = "The Compositing Window Manager and Desktop Shell";
homepage = http://enlightenment.org/;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a permanent redirect to https://www.enlightenment.org/ (nitpick)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

@disassembler
Copy link
Member

I think it should be https instead of http.

- Update to version 0.22.0
- Switch build tools from autotools to meson
- Change handling of setuid programs
@romildo
Copy link
Contributor Author

romildo commented Nov 13, 2017

I think it should be https instead of http.

Fixed

@disassembler disassembler merged commit e0483a5 into NixOS:master Nov 13, 2017
@disassembler
Copy link
Member

merged! great work! thanks!

@romildo romildo deleted the upd.enlightenment branch November 13, 2017 02:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants