From 061daca90cf204d2dad11eee0d3d81db6149a08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 31 Oct 2009 22:34:24 +0000
Subject: [PATCH] Rename Tahoe to Tahoe-LAFS.

svn path=/nixpkgs/trunk/; revision=18059
---
 .../p2p/{tahoe => tahoe-lafs}/default.nix          | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename pkgs/tools/networking/p2p/{tahoe => tahoe-lafs}/default.nix (82%)

diff --git a/pkgs/tools/networking/p2p/tahoe/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
similarity index 82%
rename from pkgs/tools/networking/p2p/tahoe/default.nix
rename to pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index f5cb2316d66..1bf6f920c4c 100644
--- a/pkgs/tools/networking/p2p/tahoe/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -2,16 +2,16 @@
 , simplejson, zfec, pycryptopp, pysqlite, nettools }:
 
 buildPythonPackage (rec {
-  name = "tahoe-1.5.0";
+  name = "tahoe-lafs-1.5.0";
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://allmydata.org/source/tahoe/releases/allmydata-${name}.zip";
+    url = "http://allmydata.org/source/tahoe/releases/allmydata-tahoe-1.5.0.zip";
     sha256 = "1cgwm7v49mlfsq47k8gw2bz14d6lnls0mr6dc18815pf24z4f00n";
   };
 
   patchPhase = ''
-    echo "forcing Tahoe to use \`setuptools' 0.6c9 rather than an unreleased version"
+    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'
@@ -43,7 +43,7 @@ buildPythonPackage (rec {
   postInstall = ''
     # Install the documentation.
 
-    # FIXME: Inkscape setfaults when run from here.  Setting $HOME to
+    # 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/'.
 
@@ -53,10 +53,10 @@ buildPythonPackage (rec {
   '';
 
   meta = {
-    description = "Tahoe, a decentralized, fault-tolerant, distributed storage system";
+    description = "Tahoe-LAFS, a decentralized, fault-tolerant, distributed storage system";
 
     longDescription = ''
-      Tahoe is a secure, decentralized, fault-tolerant filesystem.
+      Tahoe-LAFS is a secure, decentralized, fault-tolerant filesystem.
       This filesystem is encrypted and spread over multiple peers in
       such a way that it remains available even when some of the peers
       are unavailable, malfunctioning, or malicious.
@@ -64,7 +64,7 @@ buildPythonPackage (rec {
 
     homepage = http://allmydata.org/;
 
-    license = "GPLv2+";
+    license = [ "GPLv2+" /* or */ "TGPPLv1+" ];
 
     maintainers = [ lib.maintainers.ludo ];
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9e6080d9d0..cdde04c7d29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7768,7 +7768,7 @@ let
     inherit (xlibs) xextproto libXtst inputproto;
   };
 
-  tahoe = import ../tools/networking/p2p/tahoe {
+  tahoelafs = import ../tools/networking/p2p/tahoe-lafs {
     inherit fetchurl lib unzip nettools buildPythonPackage;
     inherit (pythonPackages) twisted foolscap simplejson nevow zfec
       pycryptopp pysqlite;