Merge pull request #9102 from ts468/upstream.e19

E19 update to 1.19.8

ts468 863fa55c f30a8f78

+17 -17
+2 -2
pkgs/desktops/e19/econnman.nix
··· 8 8 }; 9 9 10 10 buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ]; 11 - propagatedBuildInputs = [ python27Packages.pythonefl_1_14 python27Packages.dbus e19.elementary ]; 11 + propagatedBuildInputs = [ python27Packages.pythonefl_1_15 python27Packages.dbus e19.elementary ]; 12 12 postInstall = '' 13 - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_14}/lib/python2.7/site-packages 13 + wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_15}/lib/python2.7/site-packages 14 14 ''; 15 15 16 16 meta = {
+2 -2
pkgs/desktops/e19/efl.nix
··· 3 3 4 4 stdenv.mkDerivation rec { 5 5 name = "efl-${version}"; 6 - version = "1.14.1"; 6 + version = "1.15.0"; 7 7 src = fetchurl { 8 8 url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; 9 - sha256 = "16rj4qnpw1ya0bsp9a69w6zjmmhzni7vnc0z4wg819jg5k2njzjf"; 9 + sha256 = "1x5n2afy5z1akam5y187ajk52mq2k9lwmz7nlrxp92rvx1jf6li5"; 10 10 }; 11 11 12 12 buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
+4 -4
pkgs/desktops/e19/elementary.nix
··· 1 - { stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }: 1 + { stdenv, fetchurl, pkgconfig, e19, libcap, automake, autoconf, libdrm, gdbm }: 2 2 stdenv.mkDerivation rec { 3 3 name = "elementary-${version}"; 4 - version = "1.14.1"; 4 + version = "1.15.0"; 5 5 src = fetchurl { 6 6 url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; 7 - sha256 = "100bfzw6q57dnzcqg4zm0rqpvkk7zykfklnn6kcymv80j43xg0p1"; 7 + sha256 = "085s2xw3dhv8xiy7ikaaim5gil423g08wclhk0psi76g0vavgd32"; 8 8 }; 9 - buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; 9 + buildInputs = [ pkgconfig e19.efl libdrm gdbm automake autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; 10 10 NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ]; 11 11 patches = [ ./elementary.patch ]; 12 12 enableParallelBuilding = true;
+2 -2
pkgs/desktops/e19/emotion.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, e19, vlc }: 2 2 stdenv.mkDerivation rec { 3 3 name = "emotion_generic_players-${version}"; 4 - version = "1.14.0"; 4 + version = "1.15.0"; 5 5 src = fetchurl { 6 6 url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; 7 - sha256 = "1n1a5n2wi68n8gjw4yk6cyf11djpqpac0025vysn5w6dqgccfic3"; 7 + sha256 = "08yl473aiklj0yfxbn88000hmnhl7dbhqixsn22ias8a90rxdfhh"; 8 8 }; 9 9 buildInputs = [ pkgconfig e19.efl vlc ]; 10 10 NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ];
+2 -2
pkgs/desktops/e19/enlightenment.nix
··· 3 3 4 4 stdenv.mkDerivation rec { 5 5 name = "enlightenment-${version}"; 6 - version = "0.19.5"; 6 + version = "0.19.8"; 7 7 src = fetchurl { 8 8 url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; 9 - sha256 = "0j66x7x76fbgqfw6fi77v8qy50slw3jnsq3vvs82rrfvniabm8wc"; 9 + sha256 = "1y83jnq01k9i328adgjgpfwgpvvd2a1ixpm029pjcar8p1mvgadi"; 10 10 }; 11 11 buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb 12 12 xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2
+2 -2
pkgs/desktops/e19/evas.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: 2 2 stdenv.mkDerivation rec { 3 3 name = "evas_generic_loaders-${version}"; 4 - version = "1.14.0"; 4 + version = "1.15.0"; 5 5 src = fetchurl { 6 6 url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; 7 - sha256 = "04m8vsrigbsg9hm94lxac56frdxil1bib0bjmspa6xsfgi12afwl"; 7 + sha256 = "1k9bmswrgfara4a7znqcv3qbhq3zjbm0ks1zdb0jk5mfl6djr8na"; 8 8 }; 9 9 buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; 10 10 meta = {
+3 -3
pkgs/top-level/python-packages.nix
··· 16021 16021 }; 16022 16022 }; 16023 16023 16024 - pythonefl_1_14 = buildPythonPackage rec { 16024 + pythonefl_1_15 = buildPythonPackage rec { 16025 16025 name = "python-efl-${version}"; 16026 - version = "1.14.0"; 16026 + version = "1.15.0"; 16027 16027 src = pkgs.fetchurl { 16028 16028 url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; 16029 - sha256 = "1pns5mdyc069z6j1pywjasdd6v9xka5kjdl2yxpd6ds948dia0q0"; 16029 + sha256 = "1k3vb7pb70l2v1s2mzg91wvmncq93vb04vn60pzdlrnbcns0grhi"; 16030 16030 }; 16031 16031 preConfigure = '' 16032 16032 export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"