From acf8a34a9afbf1fac44060ed910faf2f9101eac7 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sat, 15 Mar 2008 04:35:29 +0000 Subject: [PATCH] used bleeding edge source for synergy. Got different hash from cvs checkout. svn path=/nixpkgs/trunk/; revision=11130 --- pkgs/applications/misc/synergy/default.nix | 7 +++++-- pkgs/misc/bleeding-edge-fetch-info/synergy.nix | 3 +++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 pkgs/misc/bleeding-edge-fetch-info/synergy.nix diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 71bd7a80ee73..1912ef0dfe8e 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -2,12 +2,15 @@ args: with args; stdenv.mkDerivation { name = "synergy-cvs"; - src = fetchcvs { + src = bleedingEdgeRepos.sourceByName "synergy"; + /* + fetchcvs { cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2"; module = "synergy"; date = "NOW"; - sha256 = "ef8e2ebfda6e43240051a7af9417092b2af50ece8b5c6c3fbd908ba91c4fe068"; + sha256 = "0a52b3adaae5f41cf16c5911c9037c5f2ee704a27bcaa9f874e3a4ff58d773c1"; }; + */ buildInputs = [x11 xextproto libXtst inputproto]; diff --git a/pkgs/misc/bleeding-edge-fetch-info/synergy.nix b/pkgs/misc/bleeding-edge-fetch-info/synergy.nix new file mode 100644 index 000000000000..a585e3bf5be7 --- /dev/null +++ b/pkgs/misc/bleeding-edge-fetch-info/synergy.nix @@ -0,0 +1,3 @@ + args: with args; fetchurl { + url = http://mawercer.de/~nix/repos/synergy.tar.gz; + sha256 = "c86dde2f10e7071d823cff542ea6c98a7e29a45e4909034edbd7605caa775a47";} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c20225bbee10..713a68d174de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5437,7 +5437,7 @@ rec { # linux only by now synergy = import ../applications/misc/synergy { - inherit fetchcvs stdenv x11; + inherit bleedingEdgeRepos stdenv x11; inherit (xlibs) xextproto libXtst inputproto; };