public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5217 from geerds/tox

Browse Source 
Tox: Update libtoxcore, qtox, utox and toxic
This commit is contained in:
Domen Kožar 2014-12-04 14:12:49 +01:00
commit 683740466a
5 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
View File

@ -1,16 +1,18 @@
{ stdenv, fetchurl, libtoxcore, pidgin, autoconf, automake, libtool, libsodium } : { stdenv, fetchFromGitHub, libtoxcore, pidgin, autoconf, automake, libtool
, libsodium } :
let let
version = "17a3fd9199"; version = "dd181722ea";
date = "20131012"; date = "20141202";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tox-prpl-${date}-${version}"; name = "tox-prpl-${date}-${version}";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/jin-eld/tox-prpl/tarball/${version}"; owner = "jin-eld";
name = "${name}.tar.gz"; repo = "tox-prpl";
sha256 = "0sz5wkyfwmhaj652xpsxq4p252cmmfa1vy6mp3jfyn145c758v9n"; rev = "${version}";
sha256 = "0wzyvg11h4ym28zqd24p35lza3siwm2519ga0yhk98rv458zks0v";
}; };
NIX_LDFLAGS = "-lssp -lsodium"; NIX_LDFLAGS = "-lssp -lsodium";

17
pkgs/applications/networking/instant-messengers/qtox/default.nix
View File

@ -1,29 +1,30 @@
{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openal, opencv }: { stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openalSoft, opencv
, libsodium }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qtox-dev-20140918"; name = "qtox-dev-20141201";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tux3"; owner = "tux3";
repo = "qTox"; repo = "qTox";
rev = "f06ec65bca"; rev = "qtox-windows-1417469442.11";
sha256 = "0r7qc444bgsxawyya5nw3xk1c50b90307lcwazs8mn35h4snr97m"; sha256 = "02nxj0w5qbgc79n8mgyqldk1yadf4p8pysn79f7fvi8fxq4j0j5n";
}; };
buildInputs = [ pkgconfig libtoxcore qt5 openal opencv ]; buildInputs = [ pkgconfig libtoxcore qt5 openalSoft opencv libsodium ];
configurePhase = "qmake"; configurePhase = "qmake";
installPhase = '' installPhase = ''
ensureDir $out/bin mkdir -p $out/bin
cp qtox $out/bin cp qtox $out/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "QT Tox client"; description = "QT Tox client";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ viric ]; maintainers = with maintainers; [ viric jgeerds ];
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
} }

26
pkgs/applications/networking/instant-messengers/toxic/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses { stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses
, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }: , libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }:
let stdenv.mkDerivation rec {
version = "0.5.1"; name = "toxic-dev-20141130";
in stdenv.mkDerivation rec {
name = "toxic-${version}";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/Tox/toxic/archive/v${version}.tar.gz"; owner = "Tox";
sha256 = "0zzfgwm17a4xcy9l0ll2pksp45mz6f4s3isdrgjpw1xibv9xnzcm"; repo = "toxic";
rev = "4acfe84171";
sha256 = "1yqglh9fm75zph4fzf3z4gwmamngypwpvb7shpqgakdg8ybq0a8s";
}; };
makeFlags = [ "-Cbuild" "VERSION=${version}" "PREFIX=$(out)" ]; makeFlags = [ "-Cbuild" "PREFIX=$(out)" ];
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];
buildInputs = [ buildInputs = [
@ -21,10 +21,10 @@ in stdenv.mkDerivation rec {
openal libvpx freealut openal libvpx freealut
]; ];
meta = { meta = with stdenv.lib; {
description = "Reference CLI for Tox"; description = "Reference CLI for Tox";
license = stdenv.lib.licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ viric ]; maintainers = with maintainers; [ viric jgeerds ];
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
} }

10
pkgs/applications/networking/instant-messengers/utox/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "utox-dev-20140921"; name = "utox-dev-20141130";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "notsecure"; owner = "notsecure";
repo = "uTox"; repo = "uTox";
rev = "c0afc95cf3"; rev = "38b0a2014f";
sha256 = "0a6i0c9crj6b27alm8q0fcfj8q425khg5305sp57r7pj505l4d1f"; sha256 = "00g9fsp83yjq6dfim3hfpag0ny9w5kydghycfj3ic8qaljp47y8a";
}; };
buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Lightweight Tox client"; description = "Lightweight Tox client";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ iElectric ]; maintainers = with maintainers; [ iElectric jgeerds ];
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
} }

14
pkgs/development/libraries/libtoxcore/default.nix
View File

@ -2,8 +2,8 @@
, libvpx, check, libconfig, pkgconfig }: , libvpx, check, libconfig, pkgconfig }:
let let
version = "900d72f951"; version = "f6b3e6e8fe98d2457827ac6da944e715f008a08a";
date = "20140921"; date = "20141203";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tox-core-${date}-${version}"; name = "tox-core-${date}-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/irungentoo/toxcore/tarball/${version}"; url = "https://github.com/irungentoo/toxcore/tarball/${version}";
name = "${name}.tar.gz"; name = "${name}.tar.gz";
sha256 = "1fwgflizb21mp4jwkfac7mgmahlly1f3ldbma6h8h6a2qf3pkn2r"; sha256 = "1zsx7saqs25vva3pp0bw31yqzrn40fx84w42ig6fiv723k9gpdzy";
}; };
NIX_LDFLAGS = "-lgcc_s"; NIX_LDFLAGS = "-lgcc_s";
@ -47,10 +47,10 @@ stdenv.mkDerivation rec {
# Some tests fail in the Sheevaplug due to timeout # Some tests fail in the Sheevaplug due to timeout
doCheck = !stdenv.isArm; doCheck = !stdenv.isArm;
meta = { meta = with stdenv.lib; {
description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
license = stdenv.lib.licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ viric ]; maintainers = with maintainers; [ viric jgeerds ];
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
} }