diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-04-10 07:45:38 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-04-10 07:45:38 -0500 |
commit | 88918e10e9b0776881c626452cbdec15e21a4a87 (patch) | |
tree | d436cec390c6957a7adde5cc867c63d741469fbe /pkgs/desktops | |
parent | 9863db756f1f91de1e4673510221359245a83a8f (diff) | |
parent | 37f7e152d500855f8cdab0835dcd6b545fc63cb7 (diff) | |
download | nixlib-88918e10e9b0776881c626452cbdec15e21a4a87.tar nixlib-88918e10e9b0776881c626452cbdec15e21a4a87.tar.gz nixlib-88918e10e9b0776881c626452cbdec15e21a4a87.tar.bz2 nixlib-88918e10e9b0776881c626452cbdec15e21a4a87.tar.lz nixlib-88918e10e9b0776881c626452cbdec15e21a4a87.tar.xz nixlib-88918e10e9b0776881c626452cbdec15e21a4a87.tar.zst nixlib-88918e10e9b0776881c626452cbdec15e21a4a87.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/e19/efl.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/e19/elementary.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/e19/evas.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/e19/rage.nix | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index ac7577d91fd7..c8860a5f7daa 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; - sha256 = "0wjy2n2ggjd9mzv9y0ra21wfjdbw927hdh6pz537p820bnghcivy"; + sha256 = "196293zf4pbyd5acs4nzb818yql9r67709ccfj7k3siyws6lsh4q"; }; buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix index 06166dd0978d..28ce894bfc74 100644 --- a/pkgs/desktops/e19/elementary.nix +++ b/pkgs/desktops/e19/elementary.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }: stdenv.mkDerivation rec { name = "elementary-${version}"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; - sha256 = "0jfbw48krpzcj944rvyy1rmq7cykad6cwhjh54fhp52lh7c5savk"; + sha256 = "0f8hz60aj4ar8lqnc63nlxkpf3b51scjalgy1iphgjc27hzxcb9i"; }; buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix index abc63e14f2a3..3ec3d53c69a1 100644 --- a/pkgs/desktops/e19/evas.nix +++ b/pkgs/desktops/e19/evas.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: stdenv.mkDerivation rec { name = "evas_generic_loaders-${version}"; - version = "1.13.0"; + version = "1.13.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; - sha256 = "16yzjk58bxsd0rlnpzrr8as9fxjjiq01swzhpadsgkmq33abgg63"; + sha256 = "06m8p8k8dpyvzdm690zhdzcr7n0ld12bcgjdssjfl66lil5z2mc4"; }; buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; meta = { diff --git a/pkgs/desktops/e19/rage.nix b/pkgs/desktops/e19/rage.nix index 2a5189f53f2c..0ccdb3bf3e39 100644 --- a/pkgs/desktops/e19/rage.nix +++ b/pkgs/desktops/e19/rage.nix @@ -2,10 +2,10 @@ , makeWrapper, lib }: stdenv.mkDerivation rec { name = "rage-${version}"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; - sha256 = "0d87n0rl24s7b8y3bdcg6i3yrzhil5f5vmgrmh451i4y38k84swk"; + sha256 = "0jdhbzmnvl0i2zzmjs1wgvxmnv0lm76k7h5llbb8ai34xh4yp3fi"; }; buildInputs = [ e19.elementary e19.efl automake autoconf libtool pkgconfig makeWrapper ]; |