From 2864ef44e391283ccedd0865778725d06cf94397 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 21 Sep 2022 17:41:32 +0200 Subject: [PATCH] unpaper: 6.1 -> 7.0.0 Migrates the build to meson and ninja and adds support for ffmpeg 5. The package now creates a man page that we divert into a dedicated man output. Adds the paperless test into passthru.tests for good measure. --- pkgs/tools/graphics/unpaper/default.nix | 46 ++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix index 9b8542a86bba..72c63d6cfd2c 100644 --- a/pkgs/tools/graphics/unpaper/default.nix +++ b/pkgs/tools/graphics/unpaper/default.nix @@ -1,16 +1,52 @@ -{ lib, stdenv, fetchurl, buildPackages, pkg-config, ffmpeg_4 }: +{ lib +, stdenv +, fetchurl + +# build +, meson +, ninja +, pkg-config + +# docs +, sphinx + +# runtime +, buildPackages +, ffmpeg_5 + +# tests +, nixosTests +}: stdenv.mkDerivation rec { pname = "unpaper"; - version = "6.1"; + version = "7.0.0"; src = fetchurl { url = "https://www.flameeyes.eu/files/${pname}-${version}.tar.xz"; - sha256 = "0c5rbkxbmy9k8vxjh4cv0bgnqd3wqc99yzw215vkyjslvbsq8z13"; + hash = "sha256-JXX7vybCJxnRy4grWWAsmQDH90cRisEwiD9jQZvkaoA="; }; - nativeBuildInputs = [ pkg-config buildPackages.libxslt.bin ]; - buildInputs = [ ffmpeg_4 ]; + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ + buildPackages.libxslt.bin + meson + ninja + pkg-config + sphinx + ]; + + buildInputs = [ + ffmpeg_5 + ]; + + passthru.tests = { + inherit (nixosTests) paperless; + }; meta = with lib; { homepage = "https://www.flameeyes.eu/projects/unpaper";