From 1c515819ef9df39ef309c58e052972a67159e276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= Date: Sun, 10 Feb 2013 21:23:45 +0400 Subject: [PATCH] e17: Update libs to 1.7.5, enlightenment to 0.17.1. --- pkgs/desktops/e17/default.nix | 8 +++++++ pkgs/desktops/e17/e_dbus/default.nix | 5 +++-- pkgs/desktops/e17/ecore/default.nix | 11 ++++++---- pkgs/desktops/e17/edje/default.nix | 8 +++++-- pkgs/desktops/e17/eet/default.nix | 4 ++-- pkgs/desktops/e17/eeze/default.nix | 4 ++-- pkgs/desktops/e17/efreet/default.nix | 4 ++-- pkgs/desktops/e17/eina/default.nix | 4 ++-- pkgs/desktops/e17/eio/default.nix | 24 +++++++++++++++++++++ pkgs/desktops/e17/elementary/default.nix | 19 ++++++++++++++++ pkgs/desktops/e17/embryo/default.nix | 4 ++-- pkgs/desktops/e17/emotion/default.nix | 19 ++++++++++++++++ pkgs/desktops/e17/enlightenment/default.nix | 12 ++++++----- pkgs/desktops/e17/ethumb/default.nix | 22 +++++++++++++++++++ pkgs/desktops/e17/evas/default.nix | 4 ++-- 15 files changed, 127 insertions(+), 25 deletions(-) create mode 100644 pkgs/desktops/e17/eio/default.nix create mode 100644 pkgs/desktops/e17/elementary/default.nix create mode 100644 pkgs/desktops/e17/emotion/default.nix create mode 100644 pkgs/desktops/e17/ethumb/default.nix diff --git a/pkgs/desktops/e17/default.nix b/pkgs/desktops/e17/default.nix index 6822c641913..f241f3ff0a6 100644 --- a/pkgs/desktops/e17/default.nix +++ b/pkgs/desktops/e17/default.nix @@ -10,6 +10,8 @@ rec { ecore = callPackage ./ecore { }; + eio = callPackage ./eio { }; + embryo = callPackage ./embryo { }; edje = callPackage ./edje { lua = pkgs.lua5; }; @@ -20,6 +22,12 @@ rec { eeze = callPackage ./eeze { }; + emotion = callPackage ./emotion { }; + + ethumb = callPackage ./ethumb { }; + + elementary = callPackage ./elementary { }; + #### WINDOW MANAGER diff --git a/pkgs/desktops/e17/e_dbus/default.nix b/pkgs/desktops/e17/e_dbus/default.nix index 1b3ba2c7256..44eaf2328ec 100644 --- a/pkgs/desktops/e17/e_dbus/default.nix +++ b/pkgs/desktops/e17/e_dbus/default.nix @@ -2,10 +2,10 @@ , dbus_libs }: stdenv.mkDerivation rec { name = "e_dbus-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1kky76v7yydsjihgi1hbwpyqhdmbxmxj2dw4p7kiqbl67dmsjhxg"; + sha256 = "16ckrpzzw5x1cs0fwqkk8431al55xil5magihkp9l3s77g0qd26q"; }; buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ]; propagatedBuildInputs = [ dbus_libs ]; @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { --disable-edbus-test-client --disable-edbus-notify-send --disable-edbus-notify-test + --disable-edbus-async-test ''; meta = { description = "Enlightenment's D-Bus wrapping and glue layer library"; diff --git a/pkgs/desktops/e17/ecore/default.nix b/pkgs/desktops/e17/ecore/default.nix index 47e9e05fd65..4a3eef4ec49 100644 --- a/pkgs/desktops/e17/ecore/default.nix +++ b/pkgs/desktops/e17/ecore/default.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext }: +{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext, libXrender +, libXcomposite, libXfixes, libXdamage }: stdenv.mkDerivation rec { name = "ecore-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1fq3prr2i9n14jppfpns3dg1mkk3iy0ijv2d47pm4krymd7l4hs4"; + sha256 = "08ljda6p0zj1h5sq3l0js6mihw8cr6ydynn42dnka36vachvmfjb"; }; buildInputs = [ pkgconfig eina evas ]; - propagatedBuildInputs = [ libX11 libXext ]; + propagatedBuildInputs = [ libX11 libXext libXcomposite libXrender libXfixes + libXdamage + ]; meta = { description = "Enlightenment's core mainloop, display abstraction and utility library"; longDescription = '' diff --git a/pkgs/desktops/e17/edje/default.nix b/pkgs/desktops/e17/edje/default.nix index b48794e147e..62758b2094e 100644 --- a/pkgs/desktops/e17/edje/default.nix +++ b/pkgs/desktops/e17/edje/default.nix @@ -2,12 +2,16 @@ , ecore, embryo }: stdenv.mkDerivation rec { name = "edje-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "15vh0plb9gb75q0lgbqv4kjz0pyhbfxk39x3inzn87ih567z73xx"; + sha256 = "1hsyj46bk94yd9ymf9425pf4ygy36h5gdkg9fhf8qds8cnn2kcy7"; }; buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ]; + patchPhase = '' + substituteInPlace src/bin/edje_cc_out.c --replace '%s/embryo_cc' '${embryo}/bin/embryo_cc' + substituteInPlace src/bin/edje_cc_out.c --replace 'eina_prefix_bin_get(pfx),' "" + ''; meta = { description = "Enlightenment's abstract GUI layout and animation object library"; longDescription = '' diff --git a/pkgs/desktops/e17/eet/default.nix b/pkgs/desktops/e17/eet/default.nix index 6ac119161c5..079d07187ff 100644 --- a/pkgs/desktops/e17/eet/default.nix +++ b/pkgs/desktops/e17/eet/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }: stdenv.mkDerivation rec { name = "eet-${version}"; - version = "1.6.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1cq6i9g020mi5mr069jykx1fvihd18k1y4x49skmhzfh7dv10dfp"; + sha256 = "0ys2579v45f9x2n47shq0k63g0sdbj1ndhh72dvfajihsgjwd767"; }; buildInputs = [ pkgconfig eina zlib libjpeg ]; meta = { diff --git a/pkgs/desktops/e17/eeze/default.nix b/pkgs/desktops/e17/eeze/default.nix index 4931dbf6203..162fbcf1aef 100644 --- a/pkgs/desktops/e17/eeze/default.nix +++ b/pkgs/desktops/e17/eeze/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, ecore, udev }: stdenv.mkDerivation rec { name = "eeze-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1v0n6bn3g04bjq0cxp6ixw7hb4kjbqpvywpvgik960xkn4pva76p"; + sha256 = "0274fs4cxgw6420yyz9frrc8zhj0qqyvwczzslq3kih3sx1nikxr"; }; buildInputs = [ pkgconfig eina ecore ]; propagatedBuildInputs = [ udev ]; diff --git a/pkgs/desktops/e17/efreet/default.nix b/pkgs/desktops/e17/efreet/default.nix index 960a8694b86..dfe755db597 100644 --- a/pkgs/desktops/e17/efreet/default.nix +++ b/pkgs/desktops/e17/efreet/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, eet, ecore }: stdenv.mkDerivation rec { name = "efreet-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1nydy3ahdq7q6b0xxaj79a8kd4b4xy3hzf1fdh117c9pwp4fxhl0"; + sha256 = "1yw7qjddqcnsz1vb693pa57v9wydvzfy198dc23mz46qfqx08nlg"; }; buildInputs = [ pkgconfig eina eet ecore ]; meta = { diff --git a/pkgs/desktops/e17/eina/default.nix b/pkgs/desktops/e17/eina/default.nix index 51b938790ec..77d4829a841 100644 --- a/pkgs/desktops/e17/eina/default.nix +++ b/pkgs/desktops/e17/eina/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { name = "eina-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1vchzb34hd9z8ghh75ch7sdf90gmzzpxryk3yq8hjcdxd0zjx9yj"; + sha256 = "0kd4116njrbag9h459cmfpg07c4ag04z3yrsg513lpi27amch27w"; }; meta = { description = "Enlightenment's core data structure library"; diff --git a/pkgs/desktops/e17/eio/default.nix b/pkgs/desktops/e17/eio/default.nix new file mode 100644 index 00000000000..b56422fd774 --- /dev/null +++ b/pkgs/desktops/e17/eio/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, eet, eina, ecore }: +stdenv.mkDerivation rec { + name = "eio-${version}"; + version = "1.7.5"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1bsam5q364kc4xwfv7pql6686gj0byhk42zwjqx9ajf70l23kss6"; + }; + buildInputs = [ pkgconfig eet eina ecore ]; + meta = { + description = "A library that integrates with EFL to provide efficient filesystem IO"; + longDescription = '' + Eio integrates with EFL (Ecore, Eina) to provide efficient filesystem Input/Output. + It use the best techniques to achieve such purpose, like using at-variants, splice, + properly handling errors and doing it in an asynchronous fashion by means of worker + threads. It is also ported to Windows, so multi-platform. + + Whenever you need to list a directory, copy, move or delete files, Eio will do that + task better than you'd achieve with naive implementations, and it is easy to use. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/desktops/e17/elementary/default.nix b/pkgs/desktops/e17/elementary/default.nix new file mode 100644 index 00000000000..b0240d986de --- /dev/null +++ b/pkgs/desktops/e17/elementary/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje }: +stdenv.mkDerivation rec { + name = "elementary-${version}"; + version = "1.7.5"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "08cb4x9639xyrb8d4vzvhl6v385qjfswl717sicm7iimh5zlm2l9"; + }; + buildInputs = [ pkgconfig eina eet evas ecore edje ]; + meta = { + description = "Enlightenment's core data structure library"; + longDescription = '' + Enlightenment's Eina is a core data structure and common utility + library. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/desktops/e17/embryo/default.nix b/pkgs/desktops/e17/embryo/default.nix index f09bc6b2ded..29f157545db 100644 --- a/pkgs/desktops/e17/embryo/default.nix +++ b/pkgs/desktops/e17/embryo/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina }: stdenv.mkDerivation rec { name = "embryo-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0hcjlf0rljz4zs1y5l4h0gn2gyqb1h4msfsaps8flaym4mxrvvd9"; + sha256 = "104fsa179w2dfg00sfnap7c3b4ixcps4crxa6yav755awssdcim9"; }; buildInputs = [ pkgconfig eina ]; meta = { diff --git a/pkgs/desktops/e17/emotion/default.nix b/pkgs/desktops/e17/emotion/default.nix new file mode 100644 index 00000000000..42790162171 --- /dev/null +++ b/pkgs/desktops/e17/emotion/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, ecore, evas, eet, eina, edje }: +stdenv.mkDerivation rec { + name = "emotion-${version}"; + version = "1.7.5"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1sfw8kpj2fcqymzd6q7p51xxib1n2arvjl1hnwhqkvwhlsq2b4sw"; + }; + buildInputs = [ pkgconfig ecore evas eet eina edje ]; + meta = { + description = "A library to easily integrate media playback into EFL applications"; + longDescription = '' + Emotion is a library to easily integrate media playback into EFL applications, + it will take care of using Ecore's main loop and video display is done using Evas. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/desktops/e17/enlightenment/default.nix b/pkgs/desktops/e17/enlightenment/default.nix index f8c57543f88..1c3edb07ecf 100644 --- a/pkgs/desktops/e17/enlightenment/default.nix +++ b/pkgs/desktops/e17/enlightenment/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus, embryo }: +{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus +, embryo, eio, xcbutilkeysyms, libjpeg }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.16.999.65643"; + version = "0.17.1"; src = fetchurl { - url = "http://download.enlightenment.org/snapshots/2011-11-28/${name}.tar.gz"; - sha256 = "1bb577gbccb1wrifrhv9pzm451zhig2p29mwz55b187ls31p36kz"; + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1z2vx9r7yc55rs673jg7d685slgdv9dss45asg50wh5wxp2mfi3y"; }; - buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo ]; + buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo + eio xcbutilkeysyms libjpeg ]; configureFlags = '' --with-profile=FAST_PC --disable-illume diff --git a/pkgs/desktops/e17/ethumb/default.nix b/pkgs/desktops/e17/ethumb/default.nix new file mode 100644 index 00000000000..3d1114e0171 --- /dev/null +++ b/pkgs/desktops/e17/ethumb/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, eina, evas, ecore, edje, eet }: +stdenv.mkDerivation rec { + name = "ethumb-${version}"; + version = "1.7.5"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "0prka3knz8p2n46dfrzgwn55khhhrhjny4vvnzkjcwmhvz7kgc9l"; + }; + buildInputs = [ pkgconfig eina evas ecore edje eet ]; + meta = { + description = "A thumbnail generation library"; + longDescription = '' + Ethumb - thumbnail generation library. Features: + * create thumbnails with a predefined frame (possibly an edje frame); + * have an option to create fdo-like thumbnails; + * have a client/server utility; + * TODO: make thumbnails from edje backgrounds, icons and themes; + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/desktops/e17/evas/default.nix b/pkgs/desktops/e17/evas/default.nix index 71b54f502a2..c271caa980d 100644 --- a/pkgs/desktops/e17/evas/default.nix +++ b/pkgs/desktops/e17/evas/default.nix @@ -2,10 +2,10 @@ , libX11, libXext, eina, eet }: stdenv.mkDerivation rec { name = "evas-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1lyya0nc8p0vs63azkflwq7lqqml94cqzjpg12h43sbvza342rsq"; + sha256 = "0x3k89q2wxgxjsbhdf4qws7jgpjl7rpqji98ca3nf25jf2lm1cvh"; }; buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg libX11 libXext eina eet