From b9495cc30f5cbb32cf2b6243ce775361dc31bf52 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 10 Jun 2022 14:20:37 +0000 Subject: [PATCH] zimlib: 6.3.2 -> 7.2.2 --- pkgs/development/libraries/zimlib/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index 9f8e357d3ab..56438f8e173 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchzip , meson, ninja, pkg-config , python3 , icu @@ -11,13 +11,19 @@ stdenv.mkDerivation rec { pname = "zimlib"; - version = "6.3.2"; + version = "7.2.2"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; rev = version; - sha256 = "sha256-xlYu74akK9WFy86hcQe7zp11TImwl8llgDIZBRgmbAI="; + sha256 = "sha256-AEhhjinnnMA4NbYL7NVHYeRZX/zfNiidbY/VeFjZuQs="; + }; + + testData = fetchzip rec { + passthru.version = "0.4"; + url = "https://github.com/openzim/zim-testing-suite/releases/download/v${passthru.version}/zim-testing-suite-${passthru.version}.tar.gz"; + sha256 = "sha256-2eJqmvs/GrvOD/pq8dTubaiO9ZpW2WqTNQByv354Z0w="; }; nativeBuildInputs = [ @@ -39,6 +45,8 @@ stdenv.mkDerivation rec { patchShebangs scripts ''; + mesonFlags = [ "-Dtest_data_dir=${testData}" ]; + checkInputs = [ gtest ];