diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix index 4d80b633bd32..c75af81af1a6 100644 --- a/pkgs/desktops/e19/econnman.nix +++ b/pkgs/desktops/e19/econnman.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ]; - propagatedBuildInputs = [ python27Packages.pythonefl_1_14 python27Packages.dbus e19.elementary ]; + propagatedBuildInputs = [ python27Packages.pythonefl_1_15 python27Packages.dbus e19.elementary ]; postInstall = '' - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_14}/lib/python2.7/site-packages + wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_15}/lib/python2.7/site-packages ''; meta = { diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index 7c2e0c3e378b..10b69647c0ee 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.14.1"; + version = "1.15.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; - sha256 = "16rj4qnpw1ya0bsp9a69w6zjmmhzni7vnc0z4wg819jg5k2njzjf"; + sha256 = "1x5n2afy5z1akam5y187ajk52mq2k9lwmz7nlrxp92rvx1jf6li5"; }; buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix index 15bdc08b6d3f..17973d530ffd 100644 --- a/pkgs/desktops/e19/elementary.nix +++ b/pkgs/desktops/e19/elementary.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }: +{ stdenv, fetchurl, pkgconfig, e19, libcap, automake, autoconf, libdrm, gdbm }: stdenv.mkDerivation rec { name = "elementary-${version}"; - version = "1.14.1"; + version = "1.15.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; - sha256 = "100bfzw6q57dnzcqg4zm0rqpvkk7zykfklnn6kcymv80j43xg0p1"; + sha256 = "085s2xw3dhv8xiy7ikaaim5gil423g08wclhk0psi76g0vavgd32"; }; - buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + buildInputs = [ pkgconfig e19.efl libdrm gdbm automake autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ]; patches = [ ./elementary.patch ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix index 6aa4089f52f8..a95759b6f17e 100644 --- a/pkgs/desktops/e19/emotion.nix +++ b/pkgs/desktops/e19/emotion.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, vlc }: stdenv.mkDerivation rec { name = "emotion_generic_players-${version}"; - version = "1.14.0"; + version = "1.15.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; - sha256 = "1n1a5n2wi68n8gjw4yk6cyf11djpqpac0025vysn5w6dqgccfic3"; + sha256 = "08yl473aiklj0yfxbn88000hmnhl7dbhqixsn22ias8a90rxdfhh"; }; buildInputs = [ pkgconfig e19.efl vlc ]; NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ]; diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix index 7e770ffe00b7..7a350d7396b6 100644 --- a/pkgs/desktops/e19/enlightenment.nix +++ b/pkgs/desktops/e19/enlightenment.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.19.5"; + version = "0.19.8"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "0j66x7x76fbgqfw6fi77v8qy50slw3jnsq3vvs82rrfvniabm8wc"; + sha256 = "1y83jnq01k9i328adgjgpfwgpvvd2a1ixpm029pjcar8p1mvgadi"; }; buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix index a35b4c583215..553abec576ef 100644 --- a/pkgs/desktops/e19/evas.nix +++ b/pkgs/desktops/e19/evas.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: stdenv.mkDerivation rec { name = "evas_generic_loaders-${version}"; - version = "1.14.0"; + version = "1.15.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; - sha256 = "04m8vsrigbsg9hm94lxac56frdxil1bib0bjmspa6xsfgi12afwl"; + sha256 = "1k9bmswrgfara4a7znqcv3qbhq3zjbm0ks1zdb0jk5mfl6djr8na"; }; buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; meta = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9c42d325ed3..01f784833119 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16021,12 +16021,12 @@ let }; }; - pythonefl_1_14 = buildPythonPackage rec { + pythonefl_1_15 = buildPythonPackage rec { name = "python-efl-${version}"; - version = "1.14.0"; + version = "1.15.0"; src = pkgs.fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; - sha256 = "1pns5mdyc069z6j1pywjasdd6v9xka5kjdl2yxpd6ds948dia0q0"; + sha256 = "1k3vb7pb70l2v1s2mzg91wvmncq93vb04vn60pzdlrnbcns0grhi"; }; preConfigure = '' export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"