Synergy added and fetchcvs modified (see mailinglist post)

svn path=/nixpkgs/trunk/; revision=9624
This commit is contained in:
Marc Weber 2007-11-11 08:16:23 +00:00
parent 61f4326752
commit 7a9d92486f
4 changed files with 41 additions and 27 deletions

View File

@ -0,0 +1,19 @@
args:
args.stdenv.mkDerivation {
name = "synergy-cvs";
src = args.fetchcvs {
url = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2";
module = "synergy";
tag = "-DNOW";
sha256 = "ef8e2ebfda6e43240051a7af9417092b2af50ece8b5c6c3fbd908ba91c4fe068";
};
buildInputs =(with args; [x11 xextproto libXtst inputproto]);
meta= {
description = "share mouse keyboard and clipboard between computers";
homepage = http://synergy2;
license = "GPL";
};
}

View File

@ -1,24 +1,16 @@
source $stdenv/setup
header "exporting $url $module into $out"
prefetch=$(dirname $out)/cvs-checkout-tmp-$outputHash
echo $prefetch
if test -e "$prefetch"; then
mv $prefetch $out
else
if test -z "$tag"; then
rtag="-DNOW"
else
rtag="-r $tag"
fi
cvs -f -d $url export $rtag -d $out $module
if test -z "$tag"; then
tag="-DNOW"
fi
# creating the export drictory and checking out there only to be able to
# move the content without the root directory into $out ...
# cvs -f -d "$url" export $tag -d "$out" "$module"
# should work (but didn't - got no response on #cvs)
# See als man Page for those options
actual=$(nix-hash $out)
if test "$actual" != "$outputHash"; then
echo "hash is $actual, expected $outputHash" >&2
exit 1
fi
ensureDir $out export
cd export; cvs -f -d "$url" export $tag "$module"
mv */* $out
stopNest

View File

@ -1,16 +1,13 @@
{stdenv, cvs, nix}: {url, module, tag, md5}:
# example tags:
# "-DNOW" (get current version)
# "-D2007-20-10" (get the last version before given date)
# "-r <tagname>" (get version by tag name)
{stdenv, cvs, nix}: {url, module, tag, sha256}:
stdenv.mkDerivation {
name = "cvs-export";
builder = ./builder.sh;
buildInputs = [cvs nix];
# Nix <= 0.7 compatibility.
id = md5;
outputHashAlgo = "md5";
outputHashMode = "recursive";
outputHash = md5;
inherit url module tag;
inherit url module tag sha256;
}

View File

@ -4048,6 +4048,12 @@ rec {
gpgSupport = true;
};
# linux only by now
synergy = import ../applications/misc/synergy {
inherit fetchcvs stdenv x11;
inherit (xlibs) xextproto libXtst inputproto;
};
thunderbird = thunderbird2;
thunderbird1 = import ../applications/networking/mailreaders/thunderbird-1.x {