From 93fd8fb3a54b21e836b5e06acff0ddb1dbc20d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 23 Sep 2014 23:05:33 +0200 Subject: [PATCH] Updating utox/libtoxcore to the latest, to fix utox build. There was a test failing. I also renamed the attr uTox to utox, for the more common lowercase in all-packages. --- .../networking/instant-messengers/utox/default.nix | 6 +++--- pkgs/development/libraries/libtoxcore/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 467d58d86fe9..99753f6ceeb4 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { - name = "utox-dev-20140918"; + name = "utox-dev-20140921"; src = fetchFromGitHub { owner = "notsecure"; repo = "uTox"; - rev = "26d4308ad0"; - sha256 = "0vc46dpg3hd7pfx8zny0wf546f1wfag7d8wj5rg47dg3wzwghz8p"; + rev = "c0afc95cf3"; + sha256 = "0a6i0c9crj6b27alm8q0fcfj8q425khg5305sp57r7pj505l4d1f"; }; buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 28031d6839bd..f6bdbdb3c75f 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -2,8 +2,8 @@ , libvpx, check, libconfig, pkgconfig }: let - version = "7ec83c3623"; - date = "20140918"; + version = "900d72f951"; + date = "20140921"; in stdenv.mkDerivation rec { name = "tox-core-${date}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/irungentoo/toxcore/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "026zv0brdqxf0h6zgyqpb55099yc6ghqgf8lrkdsfrrpb7ilg0is"; + sha256 = "1fwgflizb21mp4jwkfac7mgmahlly1f3ldbma6h8h6a2qf3pkn2r"; }; NIX_LDFLAGS = "-lgcc_s"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 098380a89b16..4777a974d762 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10346,7 +10346,7 @@ let webkit = webkitgtk2; }; - uTox = callPackage ../applications/networking/instant-messengers/utox { }; + utox = callPackage ../applications/networking/instant-messengers/utox { }; vanitygen = callPackage ../applications/misc/vanitygen { };