From 2027fb600d891379c53c4762463e65d040359682 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 16 Jan 2022 08:58:07 +0100 Subject: alot: application instead of python library This also allows us to move notmuch2 out of python-packages.nix. --- pkgs/development/python-modules/alot/default.nix | 71 ------------------------ pkgs/development/python-modules/notmuch/2.nix | 27 --------- 2 files changed, 98 deletions(-) delete mode 100644 pkgs/development/python-modules/alot/default.nix delete mode 100644 pkgs/development/python-modules/notmuch/2.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix deleted file mode 100644 index 6aa09f70ba3a6..0000000000000 --- a/pkgs/development/python-modules/alot/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib, buildPythonPackage, python, fetchFromGitHub, isPy3k, pytestCheckHook -, notmuch2, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme -, service-identity, gnupg, sphinx, gawk, procps, future , withManpage ? false -}: - -buildPythonPackage rec { - pname = "alot"; - version = "0.10"; - outputs = [ "out" ] ++ lib.optional withManpage "man"; - - disabled = !isPy3k; - - src = fetchFromGitHub { - owner = "pazz"; - repo = "alot"; - rev = version; - sha256 = "sha256-1reAq8X9VwaaZDY5UfvcFzHDKd71J88CqJgH3+ANjis="; - }; - - postPatch = '' - substituteInPlace alot/settings/manager.py --replace /usr/share "$out/share" - ''; - - nativeBuildInputs = lib.optional withManpage sphinx; - - propagatedBuildInputs = [ - notmuch2 - urwid - urwidtrees - twisted - python_magic - configobj - service-identity - file - gpgme - ]; - - postBuild = lib.optionalString withManpage "make -C docs man"; - - checkInputs = [ gawk future mock gnupg procps pytestCheckHook ]; - # some twisted tests need internet access - disabledTests = [ - "test_env_set" - "test_no_spawn_no_stdin_attached" - ]; - - postInstall = let - completionPython = python.withPackages (ps: [ ps.configobj ]); - in lib.optionalString withManpage '' - mkdir -p $out/man - cp -r docs/build/man $out/man - '' - + '' - mkdir -p $out/share/{applications,alot} - cp -r extra/themes $out/share/alot - - substituteInPlace extra/completion/alot-completion.zsh \ - --replace "python3" "${completionPython.interpreter}" - install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot - - sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop - ''; - - meta = with lib; { - homepage = "https://github.com/pazz/alot"; - description = "Terminal MUA using notmuch mail"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ milibopp ]; - }; -} diff --git a/pkgs/development/python-modules/notmuch/2.nix b/pkgs/development/python-modules/notmuch/2.nix deleted file mode 100644 index bd195b52d44e1..0000000000000 --- a/pkgs/development/python-modules/notmuch/2.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib - -, buildPythonPackage -, notmuch -, python -, cffi -}: - -buildPythonPackage { - pname = "notmuch2"; - inherit (notmuch) version src; - - sourceRoot = "notmuch-${notmuch.version}/bindings/python-cffi"; - - buildInputs = [ python notmuch cffi ]; - - # no tests - doCheck = false; - pythonImportsCheck = [ "notmuch2" ]; - - meta = with lib; { - description = "Pythonic bindings for the notmuch mail database using CFFI"; - homepage = "https://notmuchmail.org/"; - license = licenses.gpl3; - maintainers = with maintainers; [ teto ]; - }; -} -- cgit 1.4.1