From e685c82812aab533244b7114fcc08ba865986696 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 20 Feb 2009 16:18:56 +0000 Subject: [PATCH] Refactored tapioca-qt closure with using the latest stable release instead of SVN version svn path=/nixpkgs/trunk/; revision=14143 --- .../libraries/tapioca-qt/default.nix | 22 +++++++------------ .../libraries/telepathy-qt/default.nix | 22 +++++++------------ pkgs/top-level/all-packages.nix | 6 ++--- 3 files changed, 18 insertions(+), 32 deletions(-) diff --git a/pkgs/development/libraries/tapioca-qt/default.nix b/pkgs/development/libraries/tapioca-qt/default.nix index 962a82a8a1a8..5d5fad9d9283 100644 --- a/pkgs/development/libraries/tapioca-qt/default.nix +++ b/pkgs/development/libraries/tapioca-qt/default.nix @@ -1,16 +1,10 @@ -args: with args; -let rev = "2066"; in -stdenv.mkDerivation { - name = "tapioca-qt-r${rev}"; - src = fetchsvn { - url = "https://tapioca-voip.svn.sourceforge.net/svnroot/tapioca-voip/trunk/tapioca-qt"; - inherit rev; - sha256 = "0r2qzlm56yizdi64xga6v2sdhdcgl3cvlsd7g9ynh95813nky88z"; - }; +{stdenv, fetchurl, cmake, qt4, telepathy_qt}: - buildInputs = [cmake]; - propagatedBuildInputs = [telepathy_qt stdenv.gcc.libc]; - meta = { - description = "Qt Tapioca binding library"; - }; +stdenv.mkDerivation { + name = "tapioca-qt-0.14.1"; + src = fetchurl { + url = mirror://sourceforge/tapioca-voip/tapioca-qt-0.14.1.tar.gz; + md5 = "169318705af6386057b537c5317d520d"; + }; + buildInputs = [ cmake qt4 telepathy_qt ]; } diff --git a/pkgs/development/libraries/telepathy-qt/default.nix b/pkgs/development/libraries/telepathy-qt/default.nix index 6e8e84399d1f..bf7acaef76a5 100644 --- a/pkgs/development/libraries/telepathy-qt/default.nix +++ b/pkgs/development/libraries/telepathy-qt/default.nix @@ -1,16 +1,10 @@ -args: with args; -let rev = "2031"; in -stdenv.mkDerivation { - name = "telepathy-qt-r${rev}"; - src = fetchsvn { - url = "https://tapioca-voip.svn.sourceforge.net/svnroot/tapioca-voip/trunk/telepathy-qt"; - inherit rev; - sha256 = "0d7psgc8nr5bryrjgfg92622hbilp0qwx0pya3836bz2l6x3msnb"; - }; +{stdenv, fetchurl, cmake, qt4}: - buildInputs = [cmake]; - propagatedBuildInputs = [qt stdenv.gcc.libc]; - meta = { - description = "Qt bindings for telepathy"; - }; +stdenv.mkDerivation { + name = "telepathy-qt-0.14.1"; + src = fetchurl { + url = mirror://sourceforge/tapioca-voip/telepathy-qt-0.14.1.tar.gz; + md5 = "476e3fbd68b3eaf5354559be7de99333"; + }; + buildInputs = [ cmake qt4 ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5149bf98233a..2086c775ec36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3799,8 +3799,7 @@ let }; tapioca_qt = import ../development/libraries/tapioca-qt { - inherit fetchsvn stdenv cmake telepathy_qt; - qt = qt4; + inherit stdenv fetchurl cmake qt4 telepathy_qt; }; tecla = import ../development/libraries/tecla { @@ -3817,8 +3816,7 @@ let }; telepathy_qt = import ../development/libraries/telepathy-qt { - inherit fetchsvn stdenv cmake; - qt = qt4; + inherit stdenv fetchurl cmake qt4; }; tk = composedArgsAndFun (selectVersion ../development/libraries/tk "8.4.18") {