diff options
| author | SLNOS <anonymous@wired> | 2018-02-01 00:00:00 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-02-10 02:51:42 +0000 |
| commit | d3ea843a46266200d268e8a1d30c19aa340e8c66 (patch) | |
| tree | 565fcb3f9edf317de45699d8ffaea2fb20ee2549 | |
| parent | ad78e52357eb3df0f457c40185504567c7da524e (diff) | |
| download | nixlib-d3ea843a46266200d268e8a1d30c19aa340e8c66.tar nixlib-d3ea843a46266200d268e8a1d30c19aa340e8c66.tar.gz nixlib-d3ea843a46266200d268e8a1d30c19aa340e8c66.tar.bz2 nixlib-d3ea843a46266200d268e8a1d30c19aa340e8c66.tar.lz nixlib-d3ea843a46266200d268e8a1d30c19aa340e8c66.tar.xz nixlib-d3ea843a46266200d268e8a1d30c19aa340e8c66.tar.zst nixlib-d3ea843a46266200d268e8a1d30c19aa340e8c66.zip | |
mailpile: 0.4.1 -> 1.0.0rc1
Adaptation of #23058 by @spinus to 1.0.0rc1. See #23058 and #28111 for discussion. This patch keeps the warnings. But I think it is useful to have a sanely working version in nixpkgs, even if it is still considered insecure, just to follow the upstream development by actually running it instead of reading the log.
| -rw-r--r-- | pkgs/applications/networking/mailreaders/mailpile/default.nix | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 9c2ab08babcf..cf771004be40 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,27 +1,39 @@ -{ stdenv, fetchgit, python2Packages, gnupg1orig, makeWrapper, openssl }: +{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, makeWrapper, openssl, git }: python2Packages.buildPythonApplication rec { name = "mailpile-${version}"; - version = "0.4.1"; + version = "1.0.0rc1"; - src = fetchgit { - url = "git://github.com/pagekite/Mailpile"; - rev = "refs/tags/${version}"; - sha256 = "118b5zwfwmzj38p0mkj3r1s09jxg8x38y0a42b21imzpmli5vpb5"; + src = fetchFromGitHub { + owner = "mailpile"; + repo = "Mailpile"; + rev = "${version}"; + sha256 = "0hl42ljdzk57ndndff9f1yh08znxwj01kjdmx019vmml0arv0jga"; }; - patchPhase = '' - substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${python2Packages.python.libPrefix}/site-packages/' + dir" + postPatch = '' + patchShebangs scripts ''; + nativeBuildInputs = with python2Packages; [ pbr git ]; + PBR_VERSION=version; + propagatedBuildInputs = with python2Packages; [ - makeWrapper pillow jinja2 spambayes python2Packages.lxml - pgpdump gnupg1orig + appdirs + cryptography + fasteners + gnupg1orig + jinja2 + pgpdump + pillow + python2Packages.lxml + spambayes ]; postInstall = '' wrapProgram $out/bin/mailpile \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}" + --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}" \ + --set-default MAILPILE_SHARED "$out/share/mailpile" ''; # No tests were found |