From 7e00b9d652856125b4a1bdfb17b83272f845f770 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 26 Mar 2018 20:23:08 +0000 Subject: [PATCH 1/3] tahoelafs: rename to `tahoe-lafs` --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9962c3c8fe6..209d18f3dcc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -202,6 +202,7 @@ mapAliases (rec { sshfs = sshfs-fuse; # added 2017-08-14 sshfsFuse = sshfs-fuse; # added 2016-09 surf-webkit2 = surf; # added 2017-04-02 + tahoelafs = tahoe-lafs; # added 2018-03-26 system_config_printer = system-config-printer; # added 2016-01-03 telepathy_farstream = telepathy-farstream; # added 2018-02-25 telepathy_gabble = telepathy-gabble; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79145b7f996..dd91cd7e080 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17878,7 +17878,7 @@ with pkgs; tagainijisho = callPackage ../applications/office/tagainijisho {}; - tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs {}; + tahoe-lafs = callPackage ../tools/networking/p2p/tahoe-lafs {}; tailor = callPackage ../applications/version-management/tailor {}; From 23a814e1ad0874313849afea67e1f9357f4c381f Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 26 Mar 2018 20:22:40 +0000 Subject: [PATCH 2/3] tahoe-lafs: build HTML and info documentation --- .../networking/p2p/tahoe-lafs/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 4bdc630efd7..cc5229bcd44 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, unzip, nettools, pythonPackages }: +{ fetchurl, lib, unzip, nettools, pythonPackages, texinfo }: # FAILURES: The "running build_ext" phase fails to compile Twisted # plugins, because it tries to write them into Twisted's (immutable) @@ -15,6 +15,8 @@ pythonPackages.buildPythonApplication rec { sha256 = "0x9f1kjym1188fp6l5sqy0zz8mdb4xw861bni2ccv26q482ynbks"; }; + outputs = [ "out" "doc" "info" ]; + patchPhase = '' sed -i "src/allmydata/util/iputil.py" \ -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g" @@ -30,6 +32,8 @@ pythonPackages.buildPythonApplication rec { sed -i 's/"pycrypto.*"/"pycrypto"/' src/allmydata/_auto_deps.py ''; + nativeBuildInputs = with pythonPackages; [ sphinx texinfo ]; + buildInputs = with pythonPackages; [ unzip numpy mock ]; # The `backup' command requires `sqlite3'. @@ -39,11 +43,19 @@ pythonPackages.buildPythonApplication rec { service-identity pyyaml ]; + # Install the documentation. postInstall = '' - # Install the documentation. - mkdir -p "$out/share/doc/${name}" - cp -rv "docs/"* "$out/share/doc/${name}" - find "$out/share/doc/${name}" -name Makefile -exec rm -v {} \; + ( + cd docs + + make singlehtml + mkdir -p "$doc/share/doc/${name}" + cp -rv _build/singlehtml/* "$doc/share/doc/${name}" + + make info + mkdir -p "$info/share/info" + cp -rv _build/texinfo/*.info "$info/share/info" + ) ''; checkPhase = '' From d0849b6fdde45bd078d980030f5c074d3f55a7d1 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 26 Mar 2018 20:23:23 +0000 Subject: [PATCH 3/3] tahoe-lafs: run tests --- .../networking/p2p/tahoe-lafs/default.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index cc5229bcd44..8c0c4a6c566 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { outputs = [ "out" "doc" "info" ]; - patchPhase = '' + postPatch = '' sed -i "src/allmydata/util/iputil.py" \ -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g" @@ -32,6 +32,22 @@ pythonPackages.buildPythonApplication rec { sed -i 's/"pycrypto.*"/"pycrypto"/' src/allmydata/_auto_deps.py ''; + # Remove broken and expensive tests. + preConfigure = '' + ( + cd src/allmydata/test + + # Buggy? + rm cli/test_create.py test_backupdb.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 + + # Expensive + rm test_system.py + ) + ''; + nativeBuildInputs = with pythonPackages; [ sphinx texinfo ]; buildInputs = with pythonPackages; [ unzip numpy mock ]; @@ -59,8 +75,7 @@ pythonPackages.buildPythonApplication rec { ''; checkPhase = '' - # Still broken. ~ C. - # trial allmydata + trial --rterrors allmydata ''; meta = {