From cf707c57615a7a021c397350fe0b518ddceeb063 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 5 Nov 2009 22:11:15 +0000 Subject: [PATCH] Update GNokii svn path=/nixpkgs/trunk/; revision=18167 --- pkgs/tools/misc/gnokii/default.nix | 11 +++++------ pkgs/tools/misc/gnokii/src-for-default.nix | 9 +++++++++ pkgs/tools/misc/gnokii/src-info-for-default.nix | 4 ++++ 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 pkgs/tools/misc/gnokii/src-for-default.nix create mode 100644 pkgs/tools/misc/gnokii/src-info-for-default.nix diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index 9bf90df414d..953be646851 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -2,16 +2,13 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "0.6.27" a; + s = import ./src-for-default.nix; buildInputs = with a; [ perl intltool gettext ]; in rec { - src = fetchurl { - url = "http://www.gnokii.org/download/gnokii/gnokii-${version}.tar.bz2"; - sha256 = "11p8iv5jmlah3ls16a3jkndwlvwxxan8vwkwazlihaasfmgxgwb9"; - }; + src = a.fetchUrlFromSrcInfo s; inherit buildInputs; configureFlags = []; @@ -19,8 +16,10 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doConfigure" "doMakeInstall"]; - name = "gnokii-" + version; + inherit(s) name; meta = { description = "Cellphone tool"; + maintainers = [a.lib.maintainers.raskin]; + platforms = with a.lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/gnokii/src-for-default.nix b/pkgs/tools/misc/gnokii/src-for-default.nix new file mode 100644 index 00000000000..975384c17b3 --- /dev/null +++ b/pkgs/tools/misc/gnokii/src-for-default.nix @@ -0,0 +1,9 @@ +rec { + version="0.6.28.1"; + name="gnokii-0.6.28.1"; + hash="0l8ifslvzcwm70pycv8gycdr35g4qk1wsjxbk7b4r5z53jhc6hdz"; + url="http://www.gnokii.org/download/gnokii/gnokii-${version}.tar.gz"; + advertisedUrl="http://www.gnokii.org/download/gnokii/gnokii-0.6.28.1.tar.gz"; + + +} diff --git a/pkgs/tools/misc/gnokii/src-info-for-default.nix b/pkgs/tools/misc/gnokii/src-info-for-default.nix new file mode 100644 index 00000000000..6d68b555b18 --- /dev/null +++ b/pkgs/tools/misc/gnokii/src-info-for-default.nix @@ -0,0 +1,4 @@ +{ + downloadPage = "http://www.gnokii.org/download/gnokii/?C=M;O=D"; + baseName = "gnokii"; +}