Update linuxwacom, add 0.8.4.x

svn path=/nixpkgs/trunk/; revision=21001
This commit is contained in:
Yury G. Kudryashov 2010-04-10 20:26:41 +00:00
parent 86a0b21de8
commit 9cef0c7941
6 changed files with 24 additions and 25 deletions

View file

@ -0,0 +1,5 @@
args: (import ./wacom.nix) (args //
{
version = "0.8.4-4";
hash = "1cydd8906y923llxf9s1fvzb26dbcfvzlgasmlqpa75p98fnnrpz";
})

View file

@ -0,0 +1,5 @@
args: (import ./wacom.nix) (args //
{
version = "0.8.5-12";
hash = "0i4dx3gh7f56id5ca60l9s3ypxnwn6gg4w9a6jzkbgzbipknn71k";
})

View file

@ -1,9 +0,0 @@
rec {
version="0.8.5-1";
name="linuxwacom-0.8.5-1";
hash="0a4j9fdvi207s11h4xnx3yfnf8lqijwn6w5blwpaq8spd94xywrs";
url="http://downloads.sourceforge.net/linuxwacom/files/linuxwacom-dev/${version}/linuxwacom-${version}.tar.bz2";
advertisedUrl="http://downloads.sourceforge.net/linuxwacom/files/linuxwacom-dev/0.8.5-1/linuxwacom-0.8.5-1.tar.bz2";
}

View file

@ -1,7 +0,0 @@
{
downloadPage = "http://sourceforge.net/projects/linuxwacom/files/";
baseName = "linuxwacom";
choiceCommand = ''head -1 | sed -re "$skipRedirectSF"'';
versionExtractorSedScript = "\$extractReleaseSF";
versionReferenceCreator = "\$(replaceAllVersionOccurences)";
}

View file

@ -1,14 +1,12 @@
{ stdenv, fetchurl, libX11, libXi, inputproto
, xproto, ncurses, pkgconfig, xorgserver }:
let s = import ./src-for-default.nix; in
, xproto, ncurses, pkgconfig, xorgserver, version, hash }:
stdenv.mkDerivation rec {
inherit (s) name;
name = "linuxwacom-${version}";
src = fetchurl {
url = s.url;
sha256 = s.hash;
url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
sha256 = hash;
};
buildInputs = [ libX11 libXi inputproto xproto ncurses pkgconfig xorgserver ];
@ -27,8 +25,8 @@ stdenv.mkDerivation rec {
'';
meta = {
maintainers = [stdenv.lib.maintainers.raskin];
maintainers = with stdenv.lib.maintainers; [raskin urkud];
description = "Wacom digitizer driver for X11";
homepage = http://linuxwacom.sf.net;
homepage = http://linuxwacom.sourceforge.net;
};
}

View file

@ -9119,7 +9119,14 @@ let
flex = flex2535;
};
linuxwacom = import ../misc/linuxwacom {
linuxwacom = linuxwacom_0_8_5;
linuxwacom_0_8_5 = import ../misc/linuxwacom/0.8.5.x.nix {
inherit fetchurl stdenv ncurses pkgconfig;
inherit (xorg) libX11 libXi xproto inputproto xorgserver;
};
linuxwacom_0_8_4 = import ../misc/linuxwacom/0.8.4.x.nix {
inherit fetchurl stdenv ncurses pkgconfig;
inherit (xorg) libX11 libXi xproto inputproto xorgserver;
};