diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/networking/p2p')
-rw-r--r-- | nixpkgs/pkgs/tools/networking/p2p/azureus/builder.sh | 19 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix | 16 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 42 |
3 files changed, 23 insertions, 54 deletions
diff --git a/nixpkgs/pkgs/tools/networking/p2p/azureus/builder.sh b/nixpkgs/pkgs/tools/networking/p2p/azureus/builder.sh deleted file mode 100644 index 9d41dba2e439..000000000000 --- a/nixpkgs/pkgs/tools/networking/p2p/azureus/builder.sh +++ /dev/null @@ -1,19 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/jars -cp $src $out/jars/azureus.jar - -mkdir -p $out/bin -cat > $out/bin/azureus <<EOF -#! $SHELL -e -azureusHome=$out -if test -n "\$HOME"; then - azureusHome=\$HOME/.Azureus -fi -exec $jdk/bin/java -Xms16m -Xmx128m \ - -cp $out/jars/azureus.jar:$swt/jars/swt.jar \ - -Djava.library.path=$swt/lib \ - -Dazureus.install.path=\$azureusHome \ - org.gudy.azureus2.ui.swt.Main -EOF -chmod +x $out/bin/azureus diff --git a/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix b/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix deleted file mode 100644 index 1c72be0c5100..000000000000 --- a/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{lib, stdenv, fetchurl, jdk, swt}: - -stdenv.mkDerivation { - name = "azureus-2.3.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "http://tarballs.nixos.org/Azureus2.3.0.6.jar"; - sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd"; - }; - - inherit jdk swt; - - meta = { - platforms = lib.platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index d55a46f609b1..b0f4cd1f788a 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -1,18 +1,19 @@ -{ fetchurl, lib, nettools, pythonPackages, texinfo }: +{ lib, nettools, python3Packages, texinfo, fetchFromGitHub }: # 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. -pythonPackages.buildPythonApplication rec { - version = "1.13.0"; +python3Packages.buildPythonApplication rec { pname = "tahoe-lafs"; - namePrefix = ""; + version = "unstable-2021-07-09"; - src = fetchurl { - url = "https://tahoe-lafs.org/downloads/tahoe-lafs-${version}.tar.bz2"; - sha256 = "11pfz9yyy6qkkyi0kskxlbn2drfppx6yawqyv4kpkrkj4q7x5m42"; + src = fetchFromGitHub { + owner = "tahoe-lafs"; + repo = "tahoe-lafs"; + rev = "8e28a9d0e02fde2388aca549da2b5c452ac4337f"; + sha256 = "sha256-MuD/ZY+die7RCsuVdcePSD0DdwatXRi7CxW2iFt22L0="; }; outputs = [ "out" "doc" "info" ]; @@ -38,26 +39,30 @@ pythonPackages.buildPythonApplication rec { cd src/allmydata/test # Buggy? - rm cli/test_create.py test_backupdb.py + rm cli/test_create.py test_client.py # These require Tor and I2P. rm test_connections.py test_iputil.py test_hung_server.py test_i2p_provider.py test_tor_provider.py + # Fails due to the above tests missing + rm test_python3.py + # Expensive rm test_system.py ) ''; - nativeBuildInputs = with pythonPackages; [ sphinx texinfo ]; + nativeBuildInputs = with python3Packages; [ sphinx texinfo ]; # The `backup' command requires `sqlite3'. - propagatedBuildInputs = with pythonPackages; [ - twisted foolscap nevow simplejson zfec pycryptopp darcsver - setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface - service-identity pyyaml magic-wormhole treq characteristic + propagatedBuildInputs = with python3Packages; [ + appdirs beautifulsoup4 characteristic distro eliot fixtures foolscap future + html5lib magic-wormhole netifaces pyasn1 pycrypto pyutil pyyaml recommonmark + service-identity simplejson sphinx_rtd_theme testtools treq twisted zfec + zope_interface ]; - checkInputs = with pythonPackages; [ mock hypothesis twisted ]; + checkInputs = with python3Packages; [ mock hypothesis twisted ]; # Install the documentation. postInstall = '' @@ -78,7 +83,7 @@ pythonPackages.buildPythonApplication rec { trial --rterrors allmydata ''; - meta = { + meta = with lib; { description = "Tahoe-LAFS, a decentralized, fault-tolerant, distributed storage system"; longDescription = '' Tahoe-LAFS is a secure, decentralized, fault-tolerant filesystem. @@ -86,10 +91,9 @@ pythonPackages.buildPythonApplication rec { such a way that it remains available even when some of the peers are unavailable, malfunctioning, or malicious. ''; - homepage = "http://tahoe-lafs.org/"; - license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; + homepage = "https://tahoe-lafs.org/"; + license = [ licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = with lib.maintainers; [ MostAwesomeDude ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; - broken = true; + platforms = platforms.gnu ++ platforms.linux; }; } |