summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarc Weber <marco-oweber@gmx.de>2008-03-15 04:35:29 +0000
committerMarc Weber <marco-oweber@gmx.de>2008-03-15 04:35:29 +0000
commitacf8a34a9afbf1fac44060ed910faf2f9101eac7 (patch)
treeabb05164648b4dfdb54fc5d27bfef98c4163fa89
parentf0729c16e99284363611ee4cc2a392799a654727 (diff)
downloadnixpkgs-acf8a34a9afbf1fac44060ed910faf2f9101eac7.tar
nixpkgs-acf8a34a9afbf1fac44060ed910faf2f9101eac7.tar.gz
nixpkgs-acf8a34a9afbf1fac44060ed910faf2f9101eac7.tar.bz2
nixpkgs-acf8a34a9afbf1fac44060ed910faf2f9101eac7.tar.lz
nixpkgs-acf8a34a9afbf1fac44060ed910faf2f9101eac7.tar.xz
nixpkgs-acf8a34a9afbf1fac44060ed910faf2f9101eac7.tar.zst
nixpkgs-acf8a34a9afbf1fac44060ed910faf2f9101eac7.zip
used bleeding edge source for synergy. Got different hash from cvs checkout.
svn path=/nixpkgs/trunk/; revision=11130
-rw-r--r--pkgs/applications/misc/synergy/default.nix7
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/synergy.nix3
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 71bd7a80ee7..1912ef0dfe8 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 00000000000..a585e3bf5be
--- /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 c20225bbee1..713a68d174d 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;
   };