diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-22 16:08:37 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-22 16:08:37 +0100 |
| commit | 4c88132d25a1d793da5df67ce0bececd7b864ff5 (patch) | |
| tree | 9f134748f334089a7e471893798c645fd3a36a54 /pkgs/applications | |
| parent | 92c0720be970dfc7b3699d84feef665182f6bf2b (diff) | |
| parent | a0f8e3a30c971d6bec2eb68f1e3afe4284d8445c (diff) | |
| download | nixlib-4c88132d25a1d793da5df67ce0bececd7b864ff5.tar nixlib-4c88132d25a1d793da5df67ce0bececd7b864ff5.tar.gz nixlib-4c88132d25a1d793da5df67ce0bececd7b864ff5.tar.bz2 nixlib-4c88132d25a1d793da5df67ce0bececd7b864ff5.tar.lz nixlib-4c88132d25a1d793da5df67ce0bececd7b864ff5.tar.xz nixlib-4c88132d25a1d793da5df67ce0bececd7b864ff5.tar.zst nixlib-4c88132d25a1d793da5df67ce0bececd7b864ff5.zip | |
Merge commit 'a0f8e3a' into HEAD
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/mailreaders/afew/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/applications/version-management/nbstripout/default.nix | 2 |
2 files changed, 29 insertions, 1 deletions
diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix new file mode 100644 index 000000000000..7fbdf0f6a64c --- /dev/null +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -0,0 +1,28 @@ +{ stdenv, pythonPackages, notmuch }: + +pythonPackages.buildPythonApplication rec { + pname = "afew"; + version = "1.2.0"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "121w7bd53xyibllxxbfykjj76n81kn1vgjqd22izyh67y8qyyk5r"; + }; + + buildInputs = with pythonPackages; [ setuptools_scm ]; + + propagatedBuildInputs = with pythonPackages; [ + pythonPackages.notmuch chardet + ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32; + + makeWrapperArgs = [ + ''--prefix PATH ':' "${notmuch}/bin"'' + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/afewmail/afew; + description = "An initial tagging script for notmuch mail"; + license = licenses.isc; + maintainers = with maintainers; [ garbas andir flokli ]; + }; +} diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index c3ed61f31a23..c4c09094edd4 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { # ignore flake8 tests for the nix wrapped setup.py checkPhase = '' - PATH=$PATH:$out/bin:${mercurial}/bin pytest --ignore=nix_run_setup.py . + PATH=$PATH:$out/bin:${mercurial}/bin pytest . ''; meta = { |