diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/development/python-modules/papis/default.nix similarity index 68% rename from pkgs/tools/misc/papis/default.nix rename to pkgs/development/python-modules/papis/default.nix index f1589fc8c3b..d9be946900c 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -1,8 +1,13 @@ -{ lib, fetchFromGitHub, fetchpatch -, python3, xdg_utils +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, xdg_utils +, requests, filetype, pyparsing, configparser, arxiv2bib +, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser +, pylibgen, click, python-slugify, habanero, isbnlib +, prompt_toolkit, pygments +#, optional, dependencies +, jinja2, whoosh, pytest }: -python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "papis"; version = "0.8.2"; @@ -14,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0sa4hpgjvqkjcmp9bjr27b5m5jg4pfspdc8nf1ny80sr0kzn72hb"; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ requests filetype pyparsing configparser arxiv2bib pyyaml chardet beautifulsoup4 colorama bibtexparser pylibgen click python-slugify habanero isbnlib @@ -23,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { jinja2 whoosh ]; - checkInputs = (with python3.pkgs; [ + checkInputs = ([ pytest ]) ++ [ xdg_utils @@ -39,6 +44,6 @@ python3.pkgs.buildPythonApplication rec { description = "Powerful command-line document and bibliography manager"; homepage = http://papis.readthedocs.io/en/latest/; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.nico202 ]; + maintainers = with lib.maintainers; [ nico202 teto ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f892404b030..61cd74b5271 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16070,7 +16070,7 @@ in papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { }; - papis = callPackage ../tools/misc/papis { }; + papis = with python3Packages; toPythonApplication papis; paps = callPackage ../tools/misc/paps { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26205eaec42..41eb849fd70 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2124,6 +2124,8 @@ in { paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; + papis = callPackage ../development/python-modules/papis { }; + papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { }; pathspec = callPackage ../development/python-modules/pathspec { };