From 103625a91525a7747baaae0e8fba89a7357eed48 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 21 Mar 2021 08:30:14 +0100 Subject: [PATCH] =?UTF-8?q?yelp-tools:=203.38.0=20=E2=86=92=2040.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Maxine Aubrey --- pkgs/development/misc/yelp-tools/default.nix | 30 +++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index bf348d68041..ca7050c0678 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -6,28 +6,44 @@ , itstool , gnome3 , pkg-config +, meson +, ninja +, python3 }: -stdenv.mkDerivation rec { +python3.pkgs.buildPythonApplication rec { pname = "yelp-tools"; - version = "3.38.0"; + version = "40.0"; + + format = "other"; src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30"; + url = "mirror://gnome/sources/yelp-tools/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1bkanqp3qwmirv06mi99qv2acr5ba5rlhy9zlh0fyrfxygraqjv6"; }; nativeBuildInputs = [ pkg-config + meson + ninja + ]; + + propagatedBuildInputs = [ + libxml2 # xmllint required by yelp-check. + libxslt # xsltproc required by yelp-build and yelp-check. ]; buildInputs = [ - libxml2 - libxslt - itstool + itstool # build script checks for its presence but I am not sure if anything uses it gnome3.yelp-xsl ]; + pythonPath = [ + python3.pkgs.lxml + ]; + + strictDeps = false; # TODO: Meson cannot find xmllint oherwise. Maybe add it to machine file? + doCheck = true; passthru = {