2.0.0-rc2 -> 2.0.0, add CardDAV support

1 files changed, 15 insertions, 5 deletions

diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix
index cb3e1445aa39..38514a5604be 100644
--- a/pkgs/tools/networking/asynk/default.nix
+++ b/pkgs/tools/networking/asynk/default.nix
@@ -1,28 +1,38 @@
 { stdenv, fetchurl, python2, python2Packages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.0-rc2";
+  version = "2.0.0";
   name = "ASynK-${version}";
 
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/skarra/ASynK/archive/v${version}.tar.gz";
-    sha256 = "14s53ijn9fpxr490ypnn92zk6h5rdadf7j3z98rah1h7l659qi1b";
+    sha256 = "1bp30437mnls0kzm0525p3bg5nw9alpqrqhw186f6zp9i4y5znp1";
   };
 
-  propagatedBuildInputs = with python2Packages; [ python2 makeWrapper tornado requests dateutil ];
+  propagatedBuildInputs = with python2Packages;
+    [ python2 makeWrapper tornado requests dateutil
+      vobject gdata caldavclientlibrary-asynk ];
 
   installPhase = ''
-    mkdir -p $out/bin
+    mkdir -p $out/bin $out/lib
     cp asynk.py $out/bin/
     cp state.init.json $out/
     cp -R config $out/
-    cp -R lib $out/
+    cp lib/*.py $out/lib # */
+    cp -R lib/s $out/lib/
     cp -R asynk $out/
 
     substituteInPlace $out/bin/asynk.py \
       --replace "ASYNK_BASE_DIR    = os.path.dirname(os.path.abspath(__file__))" "ASYNK_BASE_DIR    = \"$out\""
 
+    for file in `find $out/asynk -type f`; do
+      # Oh yeah, tab characters!
+      substituteInPlace $file \
+        --replace 'from   vobject        import vobject' 'from vobject import *' \
+        --replace 'from   vobject    import vobject' 'from vobject import *'
+    done
+
     wrapProgram "$out/bin/asynk.py" \
       --prefix PYTHONPATH : "$PYTHONPATH"
   '';