There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
76999cc40e changed some hashes resulting in this PR being technically
a mass rebuild. To avoid this, I am restoring some of the hashes (even
though it seems silly). My main goal is to get this PR merged quickly
as treewide changes like this get out-of-date quickly.
This commit should be reverted on the next mass rebuild.
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
- Add runtime dependence on xkeyboard-config
- Add base.lst from xkeyboard-config to the list of keyboard layout
files. Something similar to this has been removed in a previous patch
by mistake.
- Fix location of binary edge_cc. This has been removed in a previous
patch by mastake.
- Make the explanation for the wrapping of some binaries more clear.
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eina_btlog -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eet -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eet --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eolian_gen -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eolian_gen -v` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eolian_gen -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/evas_cserve2_shm_debug -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/evas_cserve2_shm_debug --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/evas_cserve2_shm_debug help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/evas_cserve2_shm_debug -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eldbus-codegen -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eldbus-codegen --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eldbus-codegen help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls -v` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eetpack -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eetpack --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eetpack help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_cc -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_cc -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_cc --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_decc -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player -v` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elm_prefs_cc -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eolian_cxx -v` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eolian_cxx --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elua -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elua --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elua -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elua --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eina-bench-cmp -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eina-bench-cmp --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eo_debug -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eo_debug --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eo_debug -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eo_debug --help` and found version 1.20.7
- found 1.20.7 with grep in /nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7
- found 1.20.7 in filename of file in /nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7
- directory tree listing: https://gist.github.com/087102bea4216e207ad77278be475a89
Use vanilla pkg-config to build EFL applications.
The EFL library has a set of pkg-config files (*.pc) which uses
private requirements. The default pkg-config setup on nixpkgs is
patched to disable resolving those requirements. See
http://bugs.freedesktop.org/show_bug.cgi?id=4738 for reference.
As a consequence each package depending on efl has to explicitly set
the search path in order to be able to find the corresponding header
files.
By using vanilla pkg-config this is not necessary (and this is the
expected behaviour for pkg-config), allowing simpler nix expressions.
- Add the new version 1.20.2.
- Keep version 1.19.1 for now because ephoto still needs it. As soon
as a new release o ephoto which works with efl-1.20.x is availaible,
efl-1.19.x may be removed.
See #11567.
Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.
There is a small rebuild but I couldn't figure out the actual cause.
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
