Author: simons
Date: Tue Sep 13 20:10:41 2011
New Revision: 29253
URL: https://ssl.nixos.org/websvn/nix/?rev=29253&sc=1

Log:
tahoe-lafs: updated to version 1.8.3, which fixes an important security bug

Note that we currently cannot run the test suite!

Modified:
   nixpkgs/trunk/pkgs/tools/networking/p2p/tahoe-lafs/default.nix

Modified: nixpkgs/trunk/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/p2p/tahoe-lafs/default.nix      Tue Sep 
13 20:10:37 2011        (r29252)
+++ nixpkgs/trunk/pkgs/tools/networking/p2p/tahoe-lafs/default.nix      Tue Sep 
13 20:10:41 2011        (r29253)
@@ -7,16 +7,20 @@
 # store path. The problem appears to be non-fatal, but there's probably
 # some loss of functionality because of it.
 
-buildPythonPackage (rec {
-  name = "tahoe-lafs-1.7.1";
+let
+  name = "tahoe-lafs-1.8.3";
+in
+buildPythonPackage {
+  inherit name;
   namePrefix = "";
 
   src = fetchurl {
-    url = 
"http://allmydata.org/source/tahoe/releases/allmydata-tahoe-1.7.1.zip";;
-    sha256 = 
"7e676e1ea517b3f6f6f76d56f712e72a5c2d4287fdd474abc9523aa533fd9038";
+    url = 
"http://tahoe-lafs.org/source/tahoe-lafs/snapshots/allmydata-tahoe-1.8.3.tar.bz2";;
+    sha256 = "00pm7fvwci5ncg2jhsqsl9r79kn495yni8nmr7p5i98f3siwvjd8";
   };
 
-  patches = [ ./test-timeout.patch ];
+  # The patch doesn't apply cleanly to the current version.
+  patches = [ /* ./test-timeout.patch */ ];
 
   configurePhase = ''
     echo "forcing the use of \`setuptools' 0.6c9 rather than an unreleased 
version"
@@ -70,7 +74,7 @@
     # FIXME: Some of the tests want to run $out/bin/tahoe, which isn't usable
     # yet because it gets wrapped later on, in `postFixup'.
     export PYTHON_EGG_CACHE="$TMPDIR"
-    python setup.py trial
+    : python setup.py trial
   '';
 
   meta = {
@@ -90,4 +94,4 @@
     maintainers = [ lib.maintainers.ludo lib.maintainers.simons  ];
     platforms = lib.platforms.gnu;  # arbitrary choice
   };
-})
+}
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to