From b1952ce5876a8f419d7a41cabc42891e005d6b95 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sun, 25 Mar 2012 13:50:39 +0000 Subject: [PATCH] desktops/e17: Updated. svn path=/nixpkgs/trunk/; revision=33404 --- pkgs/desktops/e17/e_dbus/default.nix | 6 +++--- pkgs/desktops/e17/ecore/d.nix | 18 ------------------ pkgs/desktops/e17/ecore/default.nix | 6 +++--- pkgs/desktops/e17/edje/default.nix | 6 +++--- pkgs/desktops/e17/eet/default.nix | 6 +++--- pkgs/desktops/e17/eeze/default.nix | 6 +++--- pkgs/desktops/e17/efreet/default.nix | 6 +++--- pkgs/desktops/e17/eina/default.nix | 6 +++--- pkgs/desktops/e17/embryo/default.nix | 6 +++--- pkgs/desktops/e17/evas/default.nix | 6 +++--- 10 files changed, 27 insertions(+), 45 deletions(-) delete mode 100644 pkgs/desktops/e17/ecore/d.nix diff --git a/pkgs/desktops/e17/e_dbus/default.nix b/pkgs/desktops/e17/e_dbus/default.nix index 7c078eee0ee..1b3ba2c7256 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.1.0"; + version = "1.2.0-alpha"; src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "10y68f023jjq6dinjc0brpr41acnd7clxgb0q1j2i9isalx1473z"; + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1kky76v7yydsjihgi1hbwpyqhdmbxmxj2dw4p7kiqbl67dmsjhxg"; }; buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ]; propagatedBuildInputs = [ dbus_libs ]; diff --git a/pkgs/desktops/e17/ecore/d.nix b/pkgs/desktops/e17/ecore/d.nix deleted file mode 100644 index 73b318c4cde..00000000000 --- a/pkgs/desktops/e17/ecore/d.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, evas, xproto, libX11, libXext }: -stdenv.mkDerivation rec { - name = "ecore-${version}"; - version = "1.0.1"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "1vi03zxnsdnrjv1rh5r3v0si0b20ikrfb8hf5374i2sqvi1g65j0"; - }; - buildInputs = [ pkgconfig eina evas xproto ]; - propagatedBuildInputs = [ libX11 libXext ]; - meta = { - description = ""; - longDescription = '' - ''; - homepage = http://enlightenment.org/; - license = "BSD-style???"; - }; -} diff --git a/pkgs/desktops/e17/ecore/default.nix b/pkgs/desktops/e17/ecore/default.nix index 010a8022fca..47e9e05fd65 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.1.0"; + version = "1.2.0-alpha"; src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "12iqhrklp3k5lvbxf7lhqd53wpl1csvricfkzlcv2nny4y3r31m0"; + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1fq3prr2i9n14jppfpns3dg1mkk3iy0ijv2d47pm4krymd7l4hs4"; }; buildInputs = [ pkgconfig eina evas ]; propagatedBuildInputs = [ libX11 libXext ]; diff --git a/pkgs/desktops/e17/edje/default.nix b/pkgs/desktops/e17/edje/default.nix index 6c9e58c65fd..b48794e147e 100644 --- a/pkgs/desktops/e17/edje/default.nix +++ b/pkgs/desktops/e17/edje/default.nix @@ -2,10 +2,10 @@ , ecore, embryo }: stdenv.mkDerivation rec { name = "edje-${version}"; - version = "1.1.0"; + version = "1.2.0-alpha"; src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "0fjn4psl70hkfbjmczk06if8yxarg67w5hp2i1vq49kfkpyn2cx7"; + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "15vh0plb9gb75q0lgbqv4kjz0pyhbfxk39x3inzn87ih567z73xx"; }; buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ]; meta = { diff --git a/pkgs/desktops/e17/eet/default.nix b/pkgs/desktops/e17/eet/default.nix index 98cdca08179..6ac119161c5 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.5.0"; + version = "1.6.0-alpha"; src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "0csk2s0y3qllf40q06i4wqaj8y2p1csh5jxcqnlmf6lrk1ycjv32"; + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1cq6i9g020mi5mr069jykx1fvihd18k1y4x49skmhzfh7dv10dfp"; }; buildInputs = [ pkgconfig eina zlib libjpeg ]; meta = { diff --git a/pkgs/desktops/e17/eeze/default.nix b/pkgs/desktops/e17/eeze/default.nix index c095e25f886..4931dbf6203 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.1.0"; + version = "1.2.0-alpha"; src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "10n2qd7rf1cnsgd3mhh1wd1qm7hsf1lxx1ig72xyj55i4i5dllh3"; + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1v0n6bn3g04bjq0cxp6ixw7hb4kjbqpvywpvgik960xkn4pva76p"; }; buildInputs = [ pkgconfig eina ecore ]; propagatedBuildInputs = [ udev ]; diff --git a/pkgs/desktops/e17/efreet/default.nix b/pkgs/desktops/e17/efreet/default.nix index 291ea2f63f9..960a8694b86 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.1.0"; + version = "1.2.0-alpha"; src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "0fqrrp8dvaqhwczlh7xyh1x6wr4flpmpy6ihrjh1ywymgcvrfwkf"; + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1nydy3ahdq7q6b0xxaj79a8kd4b4xy3hzf1fdh117c9pwp4fxhl0"; }; buildInputs = [ pkgconfig eina eet ecore ]; meta = { diff --git a/pkgs/desktops/e17/eina/default.nix b/pkgs/desktops/e17/eina/default.nix index d3f02e595c1..51b938790ec 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.1.0"; + version = "1.2.0-alpha"; src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "0h2vmvr7bmnb19n124bjvi2rddv7vm15pv19lrpc7av3idk7ic4j"; + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1vchzb34hd9z8ghh75ch7sdf90gmzzpxryk3yq8hjcdxd0zjx9yj"; }; 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 2dd1a5cbab0..f09bc6b2ded 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.1.0"; + version = "1.2.0-alpha"; src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "0nk7jajsgi5xf02yxahwr3cm7bml5477fb1mas1i7a788bw7i6zn"; + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "0hcjlf0rljz4zs1y5l4h0gn2gyqb1h4msfsaps8flaym4mxrvvd9"; }; buildInputs = [ pkgconfig eina ]; meta = { diff --git a/pkgs/desktops/e17/evas/default.nix b/pkgs/desktops/e17/evas/default.nix index 84dae4822ba..71b54f502a2 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.1.0"; + version = "1.2.0-alpha"; src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "1qjmxn5a5qhc2slxjx7bsas76w0zlnrbs6hx9swr8xarkifjk3dv"; + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1lyya0nc8p0vs63azkflwq7lqqml94cqzjpg12h43sbvza342rsq"; }; buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg libX11 libXext eina eet