Vladimír Čunát 2e6bf42a22 Merge branch 'master' into staging-next ... 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		2019-08-24 08:55:37 +02:00
..
default.nix	enlightenment.efl: remove openssl 1.0.2 pinning	2019-08-01 17:56:57 +02:00
econnman.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
efl-elua.patch	e19: rename to enlightenment, drop old one	2016-03-12 03:10:37 +03:00
efl.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
enlightenment.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
enlightenment.suid-exes.patch	enlightenment: remove bashism from patch	2018-05-10 22:26:47 -03:00
ephoto.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
rage.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
terminology.nix	enlightenment.terminology: 1.4.1 -> 1.5.0	2019-08-05 22:00:55 -07:00