From 198b0b5e4a390dcb2fdc1db3b1bd328261b01d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 22 Aug 2016 19:39:23 -0300 Subject: [PATCH 1/9] efl: 1.17.2 -> 1.18.0 --- pkgs/desktops/enlightenment/efl.nix | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 218de3bfa7c..b8b3d82ccb6 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, libwebp, curl, libinput, systemd }: - +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp, curl, libinput, systemd }: stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.17.2"; + version = "1.18.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "1dpq5flygrjg931nzsr2ra8icqffzrzbs1lnrzarbpsbmgq3zacs"; + sha256 = "17mzbjmz8d2vs8p63r1sk3mppl3l2fhxy2jv24dp75lgqbsvp806"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl zlib freetype fontconfig fribidi SDL2 SDL mesa - giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base + buildInputs = [ openssl zlib lz4 freetype fontconfig fribidi SDL2 SDL mesa + giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto xorg.libX11 udev utillinux systemd ]; @@ -21,22 +20,19 @@ stdenv.mkDerivation rec { xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit - harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib libwebp curl libdrm + harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm libinput ]; # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++ - configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" - "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" + configureFlags = [ "--enable-sdl" "--enable-drm" "--enable-elput" "--with-opengl=full" + "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-liblz4" "--enable-systemd" "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb" "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "ac_ct_CXX=foo" ]; - NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; - patches = [ ./efl-elua.patch ]; preConfigure = '' - export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base.dev}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH" ''; @@ -50,7 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "Enlightenment Core libraries"; + description = "Enlightenment foundation libraries"; homepage = http://enlightenment.org/; maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; From b3974f9914e2baf8c5dcc63316366ed005cc03d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 22 Aug 2016 19:41:58 -0300 Subject: [PATCH 2/9] python-efl: 1.17.0 -> 1.18.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 177607098ea..f433e57e190 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26729,10 +26729,10 @@ in modules // { # Should be bumped along with EFL! pythonefl = buildPythonPackage rec { name = "python-efl-${version}"; - version = "1.17.0"; + version = "1.18.0"; src = pkgs.fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; - sha256 = "0yciffcgmyfmy95gidg9jhczv96jyi38zcdj0q19fjmx704zx84y"; + sha256 = "0p92xsw7sh7965mb097lxy98va5xsrkxdqqaq11fhkpwqccy2l8p"; }; preConfigure = '' @@ -26741,7 +26741,7 @@ in modules // { preBuild = "${python}/bin/${python.executable} setup.py build_ext"; installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out"; - buildInputs = with self; [ pkgs.pkgconfig pkgs.enlightenment.efl pkgs.enlightenment.elementary ]; + buildInputs = with self; [ pkgs.pkgconfig pkgs.enlightenment.efl ]; doCheck = false; meta = { From 4480c4fa001513512cae38279b3e13115d61f59e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 22 Aug 2016 19:43:13 -0300 Subject: [PATCH 3/9] enlightenment: 0.21.1 -> 0.21.2 --- pkgs/desktops/enlightenment/enlightenment.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index f490e030c65..f4ff94ad088 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, efl, elementary, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, -libffi, pam, alsaLib, luajit, bzip2, libuuid, libpthreadstubs, gdbm, libcap, mesa_glu -, xkeyboard_config }: +{ stdenv, fetchurl, pkgconfig, efl, xcbutilkeysyms, libXrandr, libXdmcp, +libxcb, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap, +mesa_glu , xkeyboard_config }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.21.1"; + version = "0.21.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "119sxrgrz163c01yx0q9n2jpmmbv0a58akmz0c2z4xy37f1m02rx"; + sha256 = "0fi5dxrprnvhnn2y51gnfpsjj44snriqi20k20a73vhaqxfn8xx8"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ efl elementary libXdmcp libxcb - xcbutilkeysyms libXrandr libffi pam alsaLib luajit bzip2 libuuid + buildInputs = [ efl libXdmcp libxcb + xcbutilkeysyms libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; - NIX_CFLAGS_COMPILE = [ "-I${efl}/include/eo-1" "-I${efl}/include/emile-1" "-I${libuuid}/include/uuid" ]; + NIX_CFLAGS_COMPILE = [ + "-I${efl}/include/ecore-imf-1" + "-I${efl}/include/emile-1" + "-I${efl}/include/eo-1" + "-I${efl}/include/ethumb-1" + "-I${efl}/include/ethumb-client-1" + ]; preConfigure = '' export USER_SESSION_DIR=$prefix/lib/systemd/user From 193ded2d99d80e00244370371c0a10d4efbe20d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 22 Aug 2016 19:44:27 -0300 Subject: [PATCH 4/9] terminology: adapt for efl-1.18.0 --- pkgs/desktops/enlightenment/terminology.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index a302b7d5f61..34506c05fab 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -1,12 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, efl, elementary }: +{ stdenv, fetchurl, pkgconfig, efl }: + stdenv.mkDerivation rec { name = "terminology-${version}"; version = "0.9.1"; + src = fetchurl { url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz"; sha256 = "1kwv9vkhngdm5v38q93xpcykghnyawhjjcb5bgy0p89gpbk7mvpc"; }; - buildInputs = [ pkgconfig efl elementary ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ efl ]; + + NIX_CFLAGS_COMPILE = [ + "-I${efl}/include/ecore-con-1" + "-I${efl}/include/eldbus-1" + "-I${efl}/include/elocation-1" + "-I${efl}/include/emile-1" + "-I${efl}/include/eo-1" + "-I${efl}/include/ethumb-1" + ]; + meta = { description = "The best terminal emulator written with the EFL"; homepage = http://enlightenment.org/; From b2222b1e915339173eb8ff43d8ef98e4385d69f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 22 Aug 2016 19:45:29 -0300 Subject: [PATCH 5/9] econnman: adapt for efl-1.18.0 --- pkgs/desktops/enlightenment/econnman.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix index 9cde3cf4594..60e63dc68ed 100644 --- a/pkgs/desktops/enlightenment/econnman.nix +++ b/pkgs/desktops/enlightenment/econnman.nix @@ -1,14 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, efl, elementary, python2Packages, dbus, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }: + stdenv.mkDerivation rec { name = "econnman-${version}"; version = "1.1"; + src = fetchurl { url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz"; sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; }; - buildInputs = [ makeWrapper pkgconfig efl python2Packages.python python2Packages.wrapPython dbus ]; - pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python elementary ]; + nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ]; + + buildInputs = [ efl python2Packages.python dbus ]; + + pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ]; + postInstall = '' wrapPythonPrograms ''; From 58a52f7e10eeb180971e1d3f33eec0686964b776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 22 Aug 2016 19:46:56 -0300 Subject: [PATCH 6/9] rage: 0.1.4 -> 0.2.0 --- pkgs/desktops/enlightenment/rage.nix | 32 +++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index 67f9c68cd61..9ef557654dc 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,15 +1,36 @@ -{ stdenv, fetchurl, elementary, efl, automake, autoconf, libtool, pkgconfig, gst_all_1 +{ stdenv, fetchurl, efl, automake, autoconf, libtool, pkgconfig, gst_all_1 , makeWrapper, lib }: + stdenv.mkDerivation rec { name = "rage-${version}"; - version = "0.1.4"; + version = "0.2.0"; + src = fetchurl { url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; - sha256 = "10j3n8crk16jzqz2hn5djx6vms5f6x83qyiaphhqx94h9dgv2mgg"; + sha256 = "06fxhznwbd5x341r8ml3cpwmvwn0aq9i1akcgclk4vjdqiyff1d9"; }; + + nativeBuildInputs = [ + automake autoconf libtool pkgconfig makeWrapper + ]; + + NIX_CFLAGS_COMPILE = [ + "-I${efl}/include/ecore-con-1" + "-I${efl}/include/ecore-evas-1" + "-I${efl}/include/ecore-file-1" + "-I${efl}/include/ecore-imf-1" + "-I${efl}/include/ecore-input-1" + "-I${efl}/include/eet-1" + "-I${efl}/include/efreet-1" + "-I${efl}/include/eldbus-1" + "-I${efl}/include/emile-1" + "-I${efl}/include/eo-1" + "-I${efl}/include/ethumb-1" + "-I${efl}/include/ethumb-client-1" + ]; + buildInputs = [ - elementary efl automake autoconf libtool pkgconfig - makeWrapper + efl gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -25,6 +46,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/rage \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; + meta = { description = "Video + Audio player along the lines of mplayer"; homepage = http://enlightenment.org/; From 98a630586e02eb5e4043c380cedc44aae24ed05c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 22 Aug 2016 19:48:28 -0300 Subject: [PATCH 7/9] enlightenment: adapt service for efl-0.18.0 --- nixos/modules/services/x11/desktop-managers/enlightenment.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 2e788d86960..8a03dd65b33 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -29,7 +29,7 @@ in config = mkIf (xcfg.enable && cfg.enable) { environment.systemPackages = [ - e.efl e.evas e.emotion e.elementary e.enlightenment + e.efl e.enlightenment e.terminology e.econnman pkgs.xorg.xauth # used by kdesu pkgs.gtk # To get GTK+'s themes. From c7ce3b2d8845b524290d49d202013018921d6b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 22 Aug 2016 19:49:19 -0300 Subject: [PATCH 8/9] enlightenment: adapt for efl-0.18.0 --- pkgs/desktops/enlightenment/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index b285498be9d..2129005ab01 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -2,9 +2,6 @@ rec { #### CORE EFL efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; }; - evas = callPackage ./evas.nix { }; - emotion = callPackage ./emotion.nix { }; - elementary = callPackage ./elementary.nix { }; #### WINDOW MANAGER enlightenment = callPackage ./enlightenment.nix { }; From adb0cf53e80607c85c2e5d6380798b34829e6265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 23 Aug 2016 10:33:10 -0300 Subject: [PATCH 9/9] efl: remove elementary, evas and emotion, as they are integrated into efl-0.18.0 --- pkgs/desktops/enlightenment/elementary.nix | 21 --------------------- pkgs/desktops/enlightenment/emotion.nix | 18 ------------------ pkgs/desktops/enlightenment/evas.nix | 17 ----------------- 3 files changed, 56 deletions(-) delete mode 100644 pkgs/desktops/enlightenment/elementary.nix delete mode 100644 pkgs/desktops/enlightenment/emotion.nix delete mode 100644 pkgs/desktops/enlightenment/evas.nix diff --git a/pkgs/desktops/enlightenment/elementary.nix b/pkgs/desktops/enlightenment/elementary.nix deleted file mode 100644 index 10334eb98e9..00000000000 --- a/pkgs/desktops/enlightenment/elementary.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, efl, libcap, automake, autoconf, libdrm, gdbm }: -stdenv.mkDerivation rec { - name = "elementary-${version}"; - version = "1.17.1"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.xz"; - sha256 = "149xjq4z71l44w1kd8zks9b2g0wjc9656w46hzd27b58afj1dqc5"; - }; - nativeBuildInputs = [ pkgconfig automake autoconf ]; - buildInputs = [ efl libdrm gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; - NIX_CFLAGS_COMPILE = [ "-I${libdrm.dev}/include/libdrm" ]; - patches = [ ./elementary.patch ]; - enableParallelBuilding = true; - meta = { - description = "Widget set/toolkit"; - homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl2; - }; -} diff --git a/pkgs/desktops/enlightenment/emotion.nix b/pkgs/desktops/enlightenment/emotion.nix deleted file mode 100644 index 39b3b162075..00000000000 --- a/pkgs/desktops/enlightenment/emotion.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, efl, vlc }: -stdenv.mkDerivation rec { - name = "emotion_generic_players-${version}"; - version = "1.17.0"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.xz"; - sha256 = "03kaql95mk0c5j50v3c5i5lmlr3gz7xlh8p8q87xz8zf9j5h1pp7"; - }; - buildInputs = [ pkgconfig efl vlc ]; - NIX_CFLAGS_COMPILE = [ "-I${efl}/include/eo-1" ]; - meta = { - description = "Extra video decoders"; - homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/desktops/enlightenment/evas.nix b/pkgs/desktops/enlightenment/evas.nix deleted file mode 100644 index fe8897b8be7..00000000000 --- a/pkgs/desktops/enlightenment/evas.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, efl, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: -stdenv.mkDerivation rec { - name = "evas_generic_loaders-${version}"; - version = "1.17.0"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.xz"; - sha256 = "0ynq1nx0bfgg19p4vki1fap36yyip53zaxpzncx2slr6jcx1kxf2"; - }; - buildInputs = [ pkgconfig efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; - meta = { - description = "Extra image decoders"; - homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - }; -}