diff options
author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-04-08 21:27:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-08 21:27:24 -0500 |
commit | 0528e1870050becf9806ae52fe20b68a830cd6da (patch) | |
tree | 1567d6d1c6c6b2d55212a661fe836908ec8dc77b | |
parent | 4685d4d1f9fbe975ec1439384f49be94e5c1ac3b (diff) | |
parent | d0849b6fdde45bd078d980030f5c074d3f55a7d1 (diff) | |
download | nixlib-0528e1870050becf9806ae52fe20b68a830cd6da.tar nixlib-0528e1870050becf9806ae52fe20b68a830cd6da.tar.gz nixlib-0528e1870050becf9806ae52fe20b68a830cd6da.tar.bz2 nixlib-0528e1870050becf9806ae52fe20b68a830cd6da.tar.lz nixlib-0528e1870050becf9806ae52fe20b68a830cd6da.tar.xz nixlib-0528e1870050becf9806ae52fe20b68a830cd6da.tar.zst nixlib-0528e1870050becf9806ae52fe20b68a830cd6da.zip |
Merge pull request #38110 from oxij/pkgs/tahoe-lafs
tahoe-lafs: install documentation, run tests
-rw-r--r-- | pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 43 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 37 insertions, 9 deletions
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 4bdc630efd79..8c0c4a6c5664 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,7 +15,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "0x9f1kjym1188fp6l5sqy0zz8mdb4xw861bni2ccv26q482ynbks"; }; - patchPhase = '' + outputs = [ "out" "doc" "info" ]; + + postPatch = '' sed -i "src/allmydata/util/iputil.py" \ -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g" @@ -30,6 +32,24 @@ 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 ]; # The `backup' command requires `sqlite3'. @@ -39,16 +59,23 @@ 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 = '' - # Still broken. ~ C. - # trial allmydata + trial --rterrors allmydata ''; meta = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 70d40fa9d986..c6a9825a1d68 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -201,6 +201,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 f113af2da292..07880a32fa1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17922,7 +17922,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 {}; |