public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/tools/networking/p2p/tahoe-lafs: updated to version 1.7.1

Browse Source 
svn path=/nixpkgs/trunk/; revision=22774
This commit is contained in:
Peter Simons 2010-07-27 23:52:22 +00:00
parent 4e872b84ee
commit 1bb86133c7
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/tools/networking/p2p/tahoe-lafs/default.nix
View File

@ -1,14 +1,19 @@
{ fetchurl, lib, unzip, buildPythonPackage, twisted, foolscap, nevow { fetchurl, lib, unzip, buildPythonPackage, twisted, foolscap, nevow
, simplejson, zfec, pycryptopp, pysqlite, darcsver, setuptoolsTrial , simplejson, zfec, pycryptopp, pysqlite, darcsver, setuptoolsTrial
, setuptoolsDarcs, numpy, nettools }: , setuptoolsDarcs, numpy, nettools, pycrypto, pyasn1 }:
# FAILURES: The "running build_ext" phase fails to compile Twisted
# plugins, because it tries to write them into Twisted's (immutable)
# store path. The problem appears to be non-fatal, but there's probably
# some loss of functionality because of it.
buildPythonPackage (rec { buildPythonPackage (rec {
name = "tahoe-lafs-1.6.1"; name = "tahoe-lafs-1.7.1";
namePrefix = ""; namePrefix = "";
src = fetchurl { src = fetchurl {
url = "http://allmydata.org/source/tahoe/releases/allmydata-tahoe-1.6.1.zip"; url = "http://allmydata.org/source/tahoe/releases/allmydata-tahoe-1.7.1.zip";
sha256 = "1b0m1fj1lrd9kvlavd6303jjgvzasj6rnlwhdysn4i2zqriv8d9f"; sha256 = "7e676e1ea517b3f6f6f76d56f712e72a5c2d4287fdd474abc9523aa533fd9038";
}; };
patches = [ ./test-timeout.patch ]; patches = [ ./test-timeout.patch ];
@ -39,12 +44,12 @@ buildPythonPackage (rec {
''; '';
buildInputs = [ unzip ] buildInputs = [ unzip ]
++ [ numpy ]; # Some tests want this ++ [ numpy ]; # Some tests want this + http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/mock-0.6.0.tar.bz2
# The `backup' command requires `pysqlite'. # The `backup' command requires `pysqlite'.
propagatedBuildInputs = propagatedBuildInputs =
[ twisted foolscap nevow simplejson zfec pycryptopp pysqlite [ twisted foolscap nevow simplejson zfec pycryptopp pysqlite
darcsver setuptoolsTrial darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1
]; ];
# The test suite is run in `postInstall'. # The test suite is run in `postInstall'.
@ -82,7 +87,7 @@ buildPythonPackage (rec {
license = [ "GPLv2+" /* or */ "TGPPLv1+" ]; license = [ "GPLv2+" /* or */ "TGPPLv1+" ];
maintainers = [ lib.maintainers.ludo ]; maintainers = [ lib.maintainers.ludo lib.maintainers.simons ];
platforms = lib.platforms.gnu; # arbitrary choice platforms = lib.platforms.gnu; # arbitrary choice
}; };
}) })

4
pkgs/top-level/all-packages.nix
View File

@ -8888,10 +8888,10 @@ let
}; };
tahoelafs = import ../tools/networking/p2p/tahoe-lafs { tahoelafs = import ../tools/networking/p2p/tahoe-lafs {
inherit fetchurl lib unzip nettools buildPythonPackage; inherit fetchurl lib unzip nettools buildPythonPackage pycrypto;
inherit (pythonPackages) twisted foolscap simplejson nevow zfec inherit (pythonPackages) twisted foolscap simplejson nevow zfec
pycryptopp pysqlite darcsver setuptoolsTrial setuptoolsDarcs pycryptopp pysqlite darcsver setuptoolsTrial setuptoolsDarcs
numpy; numpy pyasn1;
}; };
tailor = builderDefsPackage (import ../applications/version-management/tailor) { tailor = builderDefsPackage (import ../applications/version-management/tailor) {