From a7a8570eed03bec89306054bb766374dc5113eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Jan 2019 17:33:10 +0100 Subject: [PATCH] sigal: use python3Packages (#54187) --- pkgs/applications/misc/sigal/default.nix | 11 +++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index e57e9394c105..a10b58d00b61 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,16 +1,16 @@ -{ lib, buildPythonApplication, fetchPypi, pythonPackages, ffmpeg }: +{ lib, python3Packages, ffmpeg }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { version = "1.4.1"; pname = "sigal"; - src = fetchPypi { + src = python3Packages.fetchPypi { inherit version pname; sha256 = "1fg32ii26j3xpq3cryi212lx9z33qnicm1cszwv1wfpg6sr2rr61"; }; - buildInputs = with pythonPackages; [ pytest ]; - propagatedBuildInputs = with pythonPackages; [ + checkInputs = with python3Packages; [ pytest ]; + propagatedBuildInputs = with python3Packages; [ jinja2 markdown pillow @@ -32,4 +32,3 @@ buildPythonApplication rec { maintainers = with maintainers; [ domenkozar ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab8eec4bc5fb..6a0c3b98a179 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5417,9 +5417,7 @@ in sieve-connect = callPackage ../applications/networking/sieve-connect {}; - sigal = callPackage ../applications/misc/sigal { - inherit (pythonPackages) buildPythonApplication fetchPypi; - }; + sigal = callPackage ../applications/misc/sigal { }; sigil = libsForQt5.callPackage ../applications/editors/sigil { };