about summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorFabian Affolter <fabian@affolter-engineering.ch>2022-04-27 08:42:48 +0200
committerGitHub <noreply@github.com>2022-04-27 08:42:48 +0200
commit94451b167fddd876c06ac1644f99a8da64d61212 (patch)
tree40ed0ef50883df1d99d2b8b75cc431abcbbd3f54 /pkgs/applications/misc
parent56d6727bfbca1f4383cb4bcee3c712220ea57cb7 (diff)
parent559f41b0ec701712e506477bfaee6c68c249a1c5 (diff)
Merge pull request #170267 from fabaff/pilkit-fix
python3Packages.pilkit: 2.0 -> unstable-2022-02-17
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/sigal/default.nix30
1 files changed, 17 insertions, 13 deletions
diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix
index 20b944efd5d50..928a71b69047c 100644
--- a/pkgs/applications/misc/sigal/default.nix
+++ b/pkgs/applications/misc/sigal/default.nix
@@ -1,17 +1,19 @@
-{ lib, python3Packages, ffmpeg }:
+{ lib
+, python3
+, ffmpeg
+}:
 
-python3Packages.buildPythonApplication rec {
-  version = "2.2";
-  pname   = "sigal";
+python3.pkgs.buildPythonApplication rec {
+  pname = "sigal";
+  version = "2.3";
+  format = "setuptools";
 
-  src = python3Packages.fetchPypi {
+  src = python3.pkgs.fetchPypi {
     inherit version pname;
-    sha256 = "sha256-49XsNdZuicsiYJZuF1UdqMA4q33Ly/Ug/Hc4ybJKmPo=";
+    hash = "sha256-4Zsb/OBtU/jV0gThEYe8bcrb+6hW+hnzQS19q1H409Q=";
   };
 
-  disabled = !(python3Packages.pythonAtLeast "3.6");
-
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python3.pkgs; [
     # install_requires
     jinja2
     markdown
@@ -29,16 +31,18 @@ python3Packages.buildPythonApplication rec {
 
   checkInputs = [
     ffmpeg
-  ] ++ (with python3Packages; [
+  ] ++ (with python3.pkgs; [
     pytestCheckHook
   ]);
 
-  makeWrapperArgs = [ "--prefix PATH : ${ffmpeg}/bin" ];
+  makeWrapperArgs = [
+    "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}"
+  ];
 
   meta = with lib; {
     description = "Yet another simple static gallery generator";
-    homepage    = "http://sigal.saimon.org/en/latest/index.html";
-    license     = licenses.mit;
+    homepage = "http://sigal.saimon.org/";
+    license = licenses.mit;
     maintainers = with maintainers; [ domenkozar matthiasbeyer ];
   };
 }