diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 2b1e9fc4fb3..0f51719e979 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,16 +1,26 @@ -{ stdenv, fetchgit, buildPythonPackage, pythonPackages }: +{ stdenv, fetchurl, pythonPackages, gnupg1orig, makeWrapper }: -buildPythonPackage rec { - name = "mailpile-dev"; +pythonPackages.buildPythonPackage rec { + name = "mailpile-${version}"; + version = "0.4.0"; - src = fetchgit { - url = "https://github.com/pagekite/Mailpile.git"; - rev = "6e19c1942541dbdefb5155db5f2583bf3ed22aeb"; - sha256 = "04idlbjkasigq3vslcv33kg21rjyklm2yl8pyrf5h94lzabbl1fs"; + src = fetchurl { + url = "https://github.com/pagekite/Mailpile/archive/${version}.zip"; + sha256 = "1di859lnhmlih4byfpsj8x6wjvzrddw0ng0w69bsj5f9bdy4rgq4"; }; + + patchPhase = '' + substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${pythonPackages.python.libPrefix}/site-packages/' + dir" + ''; propagatedBuildInputs = with pythonPackages; [ - pillow jinja2 spambayes pythonPackages.lxml python.modules.readline or null]; + makeWrapper pillow jinja2 spambayes pythonPackages.lxml + python.modules.readline pgpdump gnupg1orig + ]; + + postInstall = '' + wrapProgram $out/bin/mailpile --prefix PATH ":" "${gnupg1orig}/bin" + ''; meta = with stdenv.lib; { description = "A modern, fast web-mail client with user-friendly encryption and privacy features"; @@ -19,4 +29,4 @@ buildPythonPackage rec { platforms = platforms.linux; maintainers = [ maintainers.iElectric ]; }; -} +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0006649f857..9c477897901 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7745,12 +7745,27 @@ let }; }; + pgpdump = pythonPackages.buildPythonPackage rec { + name = "pgpdump-1.5"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pgpdump/pgpdump-1.5.tar.gz"; + md5 = "040a451c8e63de3e61fc5b66efa7fca5"; + }; + + meta = with stdenv.lib; { + description = "Python library for parsing PGP packets"; + homepage = https://github.com/toofishes/python-pgpdump; + license = licenses.bsd3; + }; + }; + spambayes = buildPythonPackage rec { - name = "spambayes-1.1a6"; + name = "spambayes-1.1b1"; src = fetchurl { url = "mirror://sourceforge/spambayes/${name}.tar.gz"; - sha256 = "0lqhn2v0avgwxmk4dq9lkwr2g39ls2p6x8hqk5w07wd462cjsx8l"; + sha256 = "0kqvjb89b02wp41p650ydfspi1s8d7akx1igcrw62diidqbxp04n"; }; propagatedBuildInputs = [ pydns lockfile ];