diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-02-14 06:24:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 06:24:54 +0000 |
| commit | 8b03f62bd243e3deb4023ee94f35c055a105d7e5 (patch) | |
| tree | a31226cf37fcea15a22233a2bfd9ff7dd6fd43cf /pkgs | |
| parent | ce838e52b94f64a43b02fbcd0ed6b348b2f56e33 (diff) | |
| parent | d92b58908c3febc76f34870e5c6210041ba84b45 (diff) | |
| download | nixlib-8b03f62bd243e3deb4023ee94f35c055a105d7e5.tar nixlib-8b03f62bd243e3deb4023ee94f35c055a105d7e5.tar.gz nixlib-8b03f62bd243e3deb4023ee94f35c055a105d7e5.tar.bz2 nixlib-8b03f62bd243e3deb4023ee94f35c055a105d7e5.tar.lz nixlib-8b03f62bd243e3deb4023ee94f35c055a105d7e5.tar.xz nixlib-8b03f62bd243e3deb4023ee94f35c055a105d7e5.tar.zst nixlib-8b03f62bd243e3deb4023ee94f35c055a105d7e5.zip | |
Merge pull request #34799 from oxij/pkgs/mailpile10rc
mailpile: 0.4.1 -> 1.0.0rc1
Diffstat (limited to 'pkgs')
| -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..36dc94951d5c 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.0rc2"; - src = fetchgit { - url = "git://github.com/pagekite/Mailpile"; - rev = "refs/tags/${version}"; - sha256 = "118b5zwfwmzj38p0mkj3r1s09jxg8x38y0a42b21imzpmli5vpb5"; + src = fetchFromGitHub { + owner = "mailpile"; + repo = "Mailpile"; + rev = "${version}"; + sha256 = "1z5psh00fjr8gnl4yjcl4m9ywfj24y1ffa2rfb5q8hq4ksjblbdj"; }; - 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 |