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

tahoe-lafs: Upgrade from 1.9.2 -> 1.10.0

Browse Source 
Remove patches which do not apply to the newer version.
This commit is contained in:
William A. Kennington III 2014-01-10 17:21:45 -06:00
parent c916c9bc2a
commit 268ffe1144
2 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ fetchurl, lib, unzip, buildPythonPackage, twisted, foolscap, nevow { fetchurl, lib, unzip, buildPythonPackage, twisted, foolscap, nevow
, simplejson, zfec, pycryptopp, pysqlite, darcsver, setuptoolsTrial , simplejson, zfec, pycryptopp, sqlite3, darcsver, setuptoolsTrial
, setuptoolsDarcs, numpy, nettools, pycrypto, pyasn1, mock }: , setuptoolsDarcs, numpy, nettools, pycrypto, pyasn1, mock }:
# FAILURES: The "running build_ext" phase fails to compile Twisted # FAILURES: The "running build_ext" phase fails to compile Twisted
@ -8,34 +8,18 @@
# some loss of functionality because of it. # some loss of functionality because of it.
let let
name = "tahoe-lafs-1.9.2"; name = "tahoe-lafs-1.10.0";
in in
buildPythonPackage { buildPythonPackage {
inherit name; inherit name;
namePrefix = ""; namePrefix = "";
src = fetchurl { src = fetchurl {
url = "http://tahoe-lafs.org/source/tahoe-lafs/snapshots/allmydata-tahoe-1.9.2.tar.bz2"; url = "http://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-1.10.0.tar.bz2";
sha256 = "0111gmavyrnglx10kj8z7wm7y97fyg9isv71c0gx9kq4c03knxq4"; sha256 = "1qng7j1vykk8zl5da9yklkljvgxfnjky58gcay6dypz91xq1cmcw";
}; };
# The patch doesn't apply cleanly to the current version.
patches = [ /* ./test-timeout.patch */ ];
configurePhase = '' configurePhase = ''
echo "forcing the use of \`setuptools' 0.6c9 rather than an unreleased version"
for i in *setup.py
do
sed -i "$i" -es'/0.6c12dev/0.6c9/g'
done
# `find_exe()' returns a list like ['.../bin/python'
# '.../bin/twistd'], which doesn't work when `twistd' is not a
# Python script (e.g., when it's a script produced by
# `wrapProgram').
sed -i "src/allmydata/scripts/startstop_node.py" \
-es"|cmd = find_exe.find_exe('twistd')|cmd = ['${twisted}/bin/twistd']|g"
sed -i "src/allmydata/util/iputil.py" \ sed -i "src/allmydata/util/iputil.py" \
-es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g" -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g"
@ -50,9 +34,9 @@ buildPythonPackage {
buildInputs = [ unzip ] buildInputs = [ unzip ]
++ [ numpy ]; # Some tests want this + http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/mock-0.6.0.tar.bz2 ++ [ 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 `sqlite3'.
propagatedBuildInputs = propagatedBuildInputs =
[ twisted foolscap nevow simplejson zfec pycryptopp pysqlite [ twisted foolscap nevow simplejson zfec pycryptopp sqlite3
darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 mock darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 mock
]; ];
@ -61,11 +45,6 @@ buildPythonPackage {
postInstall = '' postInstall = ''
# Install the documentation. # Install the documentation.
# FIXME: Inkscape segfaults when run from here. Setting $HOME to
# something writable doesn't help; providing $FONTCONFIG_FILE doesn't
# help either. So we just don't run `make' under `docs/'.
mkdir -p "$out/share/doc/${name}" mkdir -p "$out/share/doc/${name}"
cp -rv "docs/"* "$out/share/doc/${name}" cp -rv "docs/"* "$out/share/doc/${name}"
find "$out/share/doc/${name}" -name Makefile -exec rm -v {} \; find "$out/share/doc/${name}" -name Makefile -exec rm -v {} \;
@ -88,7 +67,7 @@ buildPythonPackage {
homepage = http://allmydata.org/; homepage = http://allmydata.org/;
license = [ "GPLv2+" /* or */ "TGPPLv1+" ]; license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ];
maintainers = [ lib.maintainers.simons ]; maintainers = [ lib.maintainers.simons ];
platforms = lib.platforms.gnu; # arbitrary choice platforms = lib.platforms.gnu; # arbitrary choice

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

@ -8922,7 +8922,7 @@ let
tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs { tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs {
inherit (pythonPackages) twisted foolscap simplejson nevow zfec inherit (pythonPackages) twisted foolscap simplejson nevow zfec
pycryptopp pysqlite darcsver setuptoolsTrial setuptoolsDarcs pycryptopp sqlite3 darcsver setuptoolsTrial setuptoolsDarcs
numpy pyasn1 mock; numpy pyasn1 mock;
}; };