diff options
author | Florian Klink <flokli@flokli.de> | 2018-01-11 20:54:20 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-20 13:48:24 +0100 |
commit | 5f03d6bf4d19714fec880729b946110799dd39db (patch) | |
tree | a6a38b87f470b404046d0af7d1f29b508617095b | |
parent | 567cf47d49a97a19024d848bb1c55816b2cdd382 (diff) | |
download | nixlib-5f03d6bf4d19714fec880729b946110799dd39db.tar nixlib-5f03d6bf4d19714fec880729b946110799dd39db.tar.gz nixlib-5f03d6bf4d19714fec880729b946110799dd39db.tar.bz2 nixlib-5f03d6bf4d19714fec880729b946110799dd39db.tar.lz nixlib-5f03d6bf4d19714fec880729b946110799dd39db.tar.xz nixlib-5f03d6bf4d19714fec880729b946110799dd39db.tar.zst nixlib-5f03d6bf4d19714fec880729b946110799dd39db.zip |
afew: rewrite expression
it's an application, not a python module Also, remove name attribute. Build with python 3 by default. afew: make setuptools_scm a buildInput afew: don't set SETUPTOOLS_SCM_PRETEND_VERSION anymore we fetch from pypi, with version info properly set, so this shouldn't be an issue. afew: set license afew: add notmuch binary to PATH it seems afew calls "notmuch new" in MailMover.py afew: don't set LD_LIBRARY_PATH the library is already hardcoded pythonPackages.notmuch's globals.py
-rw-r--r-- | pkgs/applications/networking/mailreaders/afew/default.nix | 28 | ||||
-rw-r--r-- | pkgs/development/python-modules/afew/default.nix | 34 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
4 files changed, 30 insertions, 36 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/development/python-modules/afew/default.nix b/pkgs/development/python-modules/afew/default.nix deleted file mode 100644 index ca00477d4086..000000000000 --- a/pkgs/development/python-modules/afew/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub -, isPy3k , setuptools_scm, notmuch, chardet, subprocess32 }: - -buildPythonPackage rec { - pname = "afew"; - version = "1.2.0"; - name = "${pname}-${version}"; - - src = fetchFromGitHub { - owner = "afewmail"; - repo = "afew"; - rev = "3405475276a2433e1238be330e538ebf2a976e5e"; - sha256 = "1h974avnfc6636az130yjqwm28z3aaqm49bjhpy3razx6zvyhzlf"; - }; - - buildInputs = [ setuptools_scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = "${version}"; - - propagatedBuildInputs = [ - notmuch - chardet - ] ++ stdenv.lib.optional (!isPy3k) subprocess32; - - postInstall = '' - wrapProgram $out/bin/afew \ - --prefix LD_LIBRARY_PATH : ${notmuch}/lib - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/afewmail/afew; - description = "An initial tagging script for notmuch mail"; - maintainers = with maintainers; [ garbas andir flokli ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd8a7553b182..f3d4f151ff36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -414,6 +414,8 @@ with pkgs; aescrypt = callPackage ../tools/misc/aescrypt { }; + afew = callPackage ../applications/networking/mailreaders/afew { pythonPackages = python3Packages; }; + afio = callPackage ../tools/archivers/afio { }; afl = callPackage ../tools/security/afl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63ce08a1396a..fce71ec752bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -390,8 +390,6 @@ in { adal = callPackage ../development/python-modules/adal { }; - afew = callPackage ../development/python-modules/afew { }; - aiodns = callPackage ../development/python-modules/aiodns { }; aiofiles = callPackage ../development/python-modules/aiofiles { }; |