lol

e19: update

efl: 1.15.0 -> 1.16.1
elementary: 1.15.0 -> 1.16.1
emotion: 1.15.0 -> 1.16.0
enlightenment: 0.19.8 -> 0.20.3
evas: 1.15.0 -> 1.16.0
terminology: 0.8.0 -> 0.9.1
pythonefl_1_16: 1.15.0 -> 1.16.0

+38 -34
+4 -6
pkgs/desktops/e19/default.nix
··· 1 1 { callPackage, pkgs }: 2 2 let 3 - openjpeg_1 = with pkgs; lib.overrideDerivation openjpeg (oldAttrs: { 4 - name = "openjpeg-1.5.1"; 3 + openjpeg_1 = with pkgs; lib.overrideDerivation openjpeg (oldAttrs: rec { 4 + name = "openjpeg-1.5.2"; 5 5 src = fetchurl { 6 - url = "http://openjpeg.googlecode.com/files/openjpeg-1.5.1.tar.gz"; 7 - sha1 = "1b0b74d1af4c297fd82806a9325bb544caf9bb8b"; 6 + url = "mirror://sourceforge/openjpeg.mirror/${name}.tar.gz"; 7 + sha1 = "lahbqvjpsfdxsrm0wsy3pdrp3pzrjvj9"; 8 8 }; 9 - #passthru = { incDir = "openjpeg-1.5.1"; }; 10 9 }); 11 10 in 12 11 rec { ··· 23 22 econnman = callPackage ./econnman.nix { }; 24 23 terminology = callPackage ./terminology.nix { }; 25 24 rage = callPackage ./rage.nix { }; 26 - 27 25 }
+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_15 python27Packages.dbus e19.elementary ]; 11 + propagatedBuildInputs = [ python27Packages.pythonefl_1_16 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_15}/lib/python2.7/site-packages 13 + wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_16}/lib/python2.7/site-packages 14 14 ''; 15 15 16 16 meta = {
+3 -3
pkgs/desktops/e19/efl.nix
··· 3 3 4 4 stdenv.mkDerivation rec { 5 5 name = "efl-${version}"; 6 - version = "1.15.0"; 6 + version = "1.16.1"; 7 7 src = fetchurl { 8 - url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; 9 - sha256 = "1x5n2afy5z1akam5y187ajk52mq2k9lwmz7nlrxp92rvx1jf6li5"; 8 + url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; 9 + sha256 = "116s4lcfj5lrfhyvvka3np9glqyrh21cyl9rhw7al0wgb60vw0gg"; 10 10 }; 11 11 12 12 buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
+5 -5
pkgs/desktops/e19/elementary.nix
··· 1 - { stdenv, fetchurl, pkgconfig, e19, libcap, automake, autoconf, libdrm, gdbm }: 1 + { stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }: 2 2 stdenv.mkDerivation rec { 3 3 name = "elementary-${version}"; 4 - version = "1.15.0"; 4 + version = "1.16.1"; 5 5 src = fetchurl { 6 - url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; 7 - sha256 = "085s2xw3dhv8xiy7ikaaim5gil423g08wclhk0psi76g0vavgd32"; 6 + url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.xz"; 7 + sha256 = "0q58imh7s35q6cq5hsa6gqj84rkckh8s61iass8zyvcw19j66f3y"; 8 8 }; 9 - buildInputs = [ pkgconfig e19.efl libdrm gdbm automake autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; 9 + buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x 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;
+3 -3
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.15.0"; 4 + version = "1.16.0"; 5 5 src = fetchurl { 6 - url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; 7 - sha256 = "08yl473aiklj0yfxbn88000hmnhl7dbhqixsn22ias8a90rxdfhh"; 6 + url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.xz"; 7 + sha256 = "163ay26c6dx49m1am7vsxxn0gy877zhayxq0yxn9zkbq2srzvjym"; 8 8 }; 9 9 buildInputs = [ pkgconfig e19.efl vlc ]; 10 10 NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ];
+5 -5
pkgs/desktops/e19/enlightenment.nix
··· 1 - { stdenv, fetchurl, pkgconfig, e19, xorg, libffi, pam, alsaLib, luajit, bzip2 1 + { stdenv, fetchurl, pkgconfig, e19, xorg, libffi, pam, alsaLib, luajit, bzip2, libuuid 2 2 , libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 name = "enlightenment-${version}"; 6 - version = "0.19.8"; 6 + version = "0.20.3"; 7 7 src = fetchurl { 8 8 url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; 9 - sha256 = "1y83jnq01k9i328adgjgpfwgpvvd2a1ixpm029pjcar8p1mvgadi"; 9 + sha256 = "19z3bwdzwpzwi330l5g5mj7xy6wy8xrc39zivjhm0d1ql3fh649j"; 10 10 }; 11 11 buildInputs = [ pkgconfig e19.efl e19.elementary xorg.libXdmcp xorg.libxcb 12 - xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2 12 + xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2 libuuid 13 13 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; 14 - NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" ]; 14 + NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" "-I${libuuid}/include/uuid" ]; 15 15 preConfigure = '' 16 16 export USER_SESSION_DIR=$prefix/lib/systemd/user 17 17
+3 -3
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.15.0"; 4 + version = "1.16.0"; 5 5 src = fetchurl { 6 - url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; 7 - sha256 = "1k9bmswrgfara4a7znqcv3qbhq3zjbm0ks1zdb0jk5mfl6djr8na"; 6 + url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.xz"; 7 + sha256 = "1il3i3rii6ddpj7cw2mdqnb0q2wmhwnvs6qi9janna1n5hhrqyfm"; 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/desktops/e19/terminology.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, e19 }: 2 2 stdenv.mkDerivation rec { 3 3 name = "terminology-${version}"; 4 - version = "0.8.0"; 4 + version = "0.9.1"; 5 5 src = fetchurl { 6 - url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; 7 - sha256 = "7a10d44b023cf6134c2483304e4ad33bea6df0f11266aec482f54fa67a3ce628"; 6 + url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz"; 7 + sha256 = "1kwv9vkhngdm5v38q93xpcykghnyawhjjcb5bgy0p89gpbk7mvpc"; 8 8 }; 9 9 buildInputs = [ pkgconfig e19.efl e19.elementary ]; 10 10 meta = {
+10 -4
pkgs/top-level/python-packages.nix
··· 22725 22725 }; 22726 22726 }; 22727 22727 22728 - pythonefl_1_15 = buildPythonPackage rec { 22728 + pythonefl_1_16 = buildPythonPackage rec { 22729 22729 name = "python-efl-${version}"; 22730 - version = "1.15.0"; 22730 + version = "1.16.0"; 22731 22731 src = pkgs.fetchurl { 22732 - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; 22733 - sha256 = "1k3vb7pb70l2v1s2mzg91wvmncq93vb04vn60pzdlrnbcns0grhi"; 22732 + url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; 22733 + sha256 = "142ffki41xj0z2dnf011g8j4b35waviprk4x1dhvy1wgqdywl61l"; 22734 22734 }; 22735 + 22735 22736 preConfigure = '' 22736 22737 export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" 22737 22738 ''; 22739 + preBuild = "${python}/bin/${python.executable} setup.py build_ext"; 22740 + installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out"; 22741 + 22738 22742 buildInputs = with self; [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ]; 22743 + doCheck = false; 22744 + 22739 22745 meta = { 22740 22746 description = "Python bindings for EFL and Elementary"; 22741 22747 homepage = http://enlightenment.org/;