diff options
author | Rok Garbas <rok@garbas.si> | 2016-02-15 21:56:14 +0100 |
---|---|---|
committer | Rok Garbas <rok@garbas.si> | 2016-02-15 21:58:23 +0100 |
commit | 443072799dc228ef1ebb8573c4ed55cf569c2b2a (patch) | |
tree | eb29c442c62a367fa9225e4862cc1b3e7b558b3b /pkgs | |
parent | a3a9a56f8fc615c4c2d596a2d656c9f344fe71de (diff) | |
download | nixpkgs-443072799dc228ef1ebb8573c4ed55cf569c2b2a.tar nixpkgs-443072799dc228ef1ebb8573c4ed55cf569c2b2a.tar.gz nixpkgs-443072799dc228ef1ebb8573c4ed55cf569c2b2a.tar.bz2 nixpkgs-443072799dc228ef1ebb8573c4ed55cf569c2b2a.tar.lz nixpkgs-443072799dc228ef1ebb8573c4ed55cf569c2b2a.tar.xz nixpkgs-443072799dc228ef1ebb8573c4ed55cf569c2b2a.tar.zst nixpkgs-443072799dc228ef1ebb8573c4ed55cf569c2b2a.zip |
tahoelafs: 1.10.0 -> 1.10.2 and refractor expression, fixes #12004
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 26 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 14 insertions, 18 deletions
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 1f935c2f83b..dae985febbb 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -1,19 +1,18 @@ -{ fetchurl, lib, unzip, buildPythonPackage, twisted, foolscap, nevow -, simplejson, zfec, pycryptopp, sqlite3, darcsver, setuptoolsTrial, python -, setuptoolsDarcs, numpy, nettools, pycrypto, pyasn1, mock, zope_interface }: +{ fetchurl, lib, unzip, nettools, pythonPackages }: # 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. -buildPythonPackage rec { - name = "tahoe-lafs-1.10.0"; +pythonPackages.buildPythonPackage rec { + version = "1.10.2"; + name = "tahoe-lafs-${version}"; namePrefix = ""; src = fetchurl { - url = "http://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-1.10.0.tar.bz2"; - sha256 = "1qng7j1vykk8zl5da9yklkljvgxfnjky58gcay6dypz91xq1cmcw"; + url = "http://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-${version}.tar.bz2"; + sha256 = "1rvv0ik5biy7ji8pg56v0qycnggzr3k6dbg88n555nb6r4cxgmgy"; }; patchPhase = '' @@ -32,13 +31,14 @@ buildPythonPackage rec { ''; # Some tests want this + http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/mock-0.6.0.tar.bz2 - buildInputs = [ unzip numpy ]; + buildInputs = with pythonPackages; [ unzip numpy mock ]; # The `backup' command requires `sqlite3'. - propagatedBuildInputs = - [ twisted foolscap nevow simplejson zfec pycryptopp sqlite3 - darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface mock - ]; + propagatedBuildInputs = with pythonPackages; [ + twisted foolscap nevow simplejson zfec pycryptopp sqlite3 darcsver + setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface + service-identity + ]; postInstall = '' # Install the documentation. @@ -49,7 +49,7 @@ buildPythonPackage rec { checkPhase = '' # TODO: broken with wheels - #${python.interpreter} setup.py trial + #${pythonPackages.python.interpreter} setup.py trial ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93558c8401f..be1251595ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13496,11 +13496,7 @@ let tagainijisho = callPackage ../applications/office/tagainijisho {}; - tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs { - inherit (pythonPackages) twisted foolscap simplejson nevow zfec - pycryptopp sqlite3 darcsver setuptoolsTrial setuptoolsDarcs - numpy pyasn1 mock zope_interface; - }; + tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs {}; tailor = callPackage ../applications/version-management/tailor {}; |