From 8c5a3d86ae8076910fc7cff1cd5efffed7cef77f Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 9 Nov 2017 19:28:47 +0100 Subject: [PATCH] paperwork-backend: Move into its own file This package is most likely only used by Paperwork and thus it makes sense to put it next to the main expression of Paperwork. No functional changes here, evaluating before this commit and afterwards leads to the same derivation hash. Signed-off-by: aszlig --- .../applications/office/paperwork/backend.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 31 +-------------- 2 files changed, 40 insertions(+), 30 deletions(-) create mode 100644 pkgs/applications/office/paperwork/backend.nix diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix new file mode 100644 index 00000000000..55752996464 --- /dev/null +++ b/pkgs/applications/office/paperwork/backend.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage, lib, fetchFromGitHub + +, isPy3k, isPyPy + +, pyenchant, simplebayes, pillow, pycountry, whoosh, termcolor +, python-Levenshtein, pyinsane2, pygobject3, pyocr, natsort + +, pkgs +}: + +buildPythonPackage rec { + name = "paperwork-backend-${version}"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "openpaperwork"; + repo = "paperwork-backend"; + rev = version; + sha256 = "1lrawibm6jnykj1bkrl8196kcxrhndzp7r0brdrb4hs54gql7j5x"; + }; + + # Python 2.x is not supported. + disabled = !isPy3k && !isPyPy; + + preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend"; + + propagatedBuildInputs = [ + pyenchant simplebayes pillow pycountry whoosh termcolor + python-Levenshtein pyinsane2 pygobject3 pyocr natsort + pkgs.poppler_gi pkgs.gtk3 + ]; + + meta = { + description = "Backend part of Paperwork (Python API, no UI)"; + homepage = https://openpaper.work/; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.aszlig ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a211ddefe81..922b4b738cb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6495,36 +6495,7 @@ in { # These used to be here but were moved to all-packages, but I'll leave them around for a while. pants = pkgs.pants; - paperwork-backend = buildPythonPackage rec { - name = "paperwork-backend-${version}"; - version = "1.2.1"; - - src = pkgs.fetchFromGitHub { - owner = "openpaperwork"; - repo = "paperwork-backend"; - rev = version; - sha256 = "1lrawibm6jnykj1bkrl8196kcxrhndzp7r0brdrb4hs54gql7j5x"; - }; - - # Python 2.x is not supported. - disabled = !isPy3k && !isPyPy; - - preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend"; - - propagatedBuildInputs = with self; [ - pyenchant simplebayes pillow pycountry whoosh termcolor - python-Levenshtein pyinsane2 pygobject3 pyocr - pkgs.poppler_gi pkgs.gtk3 - natsort - ]; - - meta = { - description = "Backend part of Paperwork (Python API, no UI)"; - homepage = https://openpaper.work/; - license = licenses.gpl3Plus; - maintainers = [ maintainers.aszlig ]; - }; - }; + paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; pathspec = callPackage ../development/python-modules/pathspec { };