diff --git a/pkgs/desktops/e17/e_dbus/default.nix b/pkgs/desktops/e17/e_dbus/default.nix index 44be90f7af93..7c078eee0eea 100644 --- a/pkgs/desktops/e17/e_dbus/default.nix +++ b/pkgs/desktops/e17/e_dbus/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, ecore, eina, evas, dbus_libs }: +{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, expat, ecore, eina, evas +, dbus_libs }: stdenv.mkDerivation rec { name = "e_dbus-${version}"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "1ifkijy4ap2mlqw2nd1dlvzlppyi7bnp15bxiy40nhdly8vhpbdl"; + sha256 = "10y68f023jjq6dinjc0brpr41acnd7clxgb0q1j2i9isalx1473z"; }; - buildInputs = [ pkgconfig ecore eina evas ]; + buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ]; propagatedBuildInputs = [ dbus_libs ]; configureFlags = '' --disable-edbus-test diff --git a/pkgs/desktops/e17/ecore/default.nix b/pkgs/desktops/e17/ecore/default.nix index 004d708070c3..010a8022fca5 100644 --- a/pkgs/desktops/e17/ecore/default.nix +++ b/pkgs/desktops/e17/ecore/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext }: stdenv.mkDerivation rec { name = "ecore-${version}"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "1vi03zxnsdnrjv1rh5r3v0si0b20ikrfb8hf5374i2sqvi1g65j0"; + sha256 = "12iqhrklp3k5lvbxf7lhqd53wpl1csvricfkzlcv2nny4y3r31m0"; }; buildInputs = [ pkgconfig eina evas ]; propagatedBuildInputs = [ libX11 libXext ]; diff --git a/pkgs/desktops/e17/edje/default.nix b/pkgs/desktops/e17/edje/default.nix index 3272963b8b63..6c9e58c65fd2 100644 --- a/pkgs/desktops/e17/edje/default.nix +++ b/pkgs/desktops/e17/edje/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, lua, eina, eet, evas, ecore, embryo }: +{ stdenv, fetchurl, pkgconfig, lua, expat, zlib, libjpeg, eina, eet, evas +, ecore, embryo }: stdenv.mkDerivation rec { name = "edje-${version}"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "0z7gjj4ccjr36ba763ijmjkya58fc173vpdw1m298zwhy8n4164j"; + sha256 = "0fjn4psl70hkfbjmczk06if8yxarg67w5hp2i1vq49kfkpyn2cx7"; }; - buildInputs = [ pkgconfig lua eina eet evas ecore embryo ]; + buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ]; 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 7f2809c0aa0a..98cdca08179f 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.4.1"; + version = "1.5.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "1hlznlmgkgzxnkmc3qgqjrc62bmwqj5af8lsh59vac2gf4jnymnc"; + sha256 = "0csk2s0y3qllf40q06i4wqaj8y2p1csh5jxcqnlmf6lrk1ycjv32"; }; buildInputs = [ pkgconfig eina zlib libjpeg ]; meta = { diff --git a/pkgs/desktops/e17/eeze/default.nix b/pkgs/desktops/e17/eeze/default.nix index 3499d29dbb11..c095e25f886a 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.0.2"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "0g6afhnl862clj1rfh0s4nzdnhdikylbalfp8zmsw56dj0zncynq"; + sha256 = "10n2qd7rf1cnsgd3mhh1wd1qm7hsf1lxx1ig72xyj55i4i5dllh3"; }; buildInputs = [ pkgconfig eina ecore ]; propagatedBuildInputs = [ udev ]; diff --git a/pkgs/desktops/e17/efreet/default.nix b/pkgs/desktops/e17/efreet/default.nix index e1e8d34197fd..291ea2f63f9c 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.0.1"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "0fakczsrr1idyvrp04mxw51ww017kn65xa77vq8wka4js8y0nagi"; + sha256 = "0fqrrp8dvaqhwczlh7xyh1x6wr4flpmpy6ihrjh1ywymgcvrfwkf"; }; buildInputs = [ pkgconfig eina eet ecore ]; meta = { diff --git a/pkgs/desktops/e17/eina/default.nix b/pkgs/desktops/e17/eina/default.nix index b4c3d0a72919..d3f02e595c15 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.0.1"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "1v2z1l6nqr7hnp5gki3972kprlvylpalp5wq9xdppm250z91kaas"; + sha256 = "0h2vmvr7bmnb19n124bjvi2rddv7vm15pv19lrpc7av3idk7ic4j"; }; meta = { description = "Enlightenment's core data structure library"; diff --git a/pkgs/desktops/e17/embryo/default.nix b/pkgs/desktops/e17/embryo/default.nix index e23b3f4b0b15..2dd1a5cbab07 100644 --- a/pkgs/desktops/e17/embryo/default.nix +++ b/pkgs/desktops/e17/embryo/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, pkgconfig, eina }: stdenv.mkDerivation rec { name = "embryo-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "0ch9vps83s892vda1ss1cf1fbgzff9p51df2fip7fqlj8y1shvvx"; + sha256 = "0nk7jajsgi5xf02yxahwr3cm7bml5477fb1mas1i7a788bw7i6zn"; }; + buildInputs = [ pkgconfig eina ]; meta = { description = "Enlightenment's small Pawn based virtual machine and compiler"; longDescription = '' diff --git a/pkgs/desktops/e17/enlightenment/default.nix b/pkgs/desktops/e17/enlightenment/default.nix index b21bfc92ef2a..f8c57543f88f 100644 --- a/pkgs/desktops/e17/enlightenment/default.nix +++ b/pkgs/desktops/e17/enlightenment/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus, embryo }: stdenv.mkDerivation rec { - name = "enlightenment-0.16.999.55225"; + name = "enlightenment-${version}"; + version = "0.16.999.65643"; src = fetchurl { - url = "http://download.enlightenment.org/snapshots/2010-12-03/${name}.tar.gz"; - sha256 = "1cv701fidp9mx3g5m9klmzsp0fj149rb133v1w76rzms3a0wljl1"; + url = "http://download.enlightenment.org/snapshots/2011-11-28/${name}.tar.gz"; + sha256 = "1bb577gbccb1wrifrhv9pzm451zhig2p29mwz55b187ls31p36kz"; }; buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo ]; configureFlags = '' diff --git a/pkgs/desktops/e17/evas/default.nix b/pkgs/desktops/e17/evas/default.nix index c546eb1af54a..84dae4822bab 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.0.1"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "0xkwyvxy32dwja0i3j8r8bzlybjwlrgmrhcri1bscp3aaj75x2rx"; + sha256 = "1qjmxn5a5qhc2slxjx7bsas76w0zlnrbs6hx9swr8xarkifjk3dv"; }; buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg libX11 libXext eina eet