From 1c5e101ff55122ee1b8affa6b76099d8d7f7203d Mon Sep 17 00:00:00 2001 From: Simon Hollingshead Date: Sat, 24 Feb 2024 16:29:43 +0000 Subject: [PATCH] zimlib: 8.2.0 -> 9.1.0 https://raw.githubusercontent.com/openzim/libzim/9.1.0/ChangeLog --- pkgs/development/libraries/zimlib/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index 40f8e670b526..fdcad63a279f 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -11,19 +11,19 @@ stdenv.mkDerivation rec { pname = "zimlib"; - version = "8.2.0"; + version = "9.1.0"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; rev = version; - sha256 = "sha256-ab7UUF+I0/xaGChvdjylEQRHLOjmtg/wk+/JEGehGLE="; + hash = "sha256-yWnW/+CaQwbemrNLzvQpXw5yvW2Q6LtwDgvA58+fVUs="; }; testData = fetchzip rec { - passthru.version = "0.4"; + passthru.version = "0.5"; 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="; + hash = "sha256-hCIFT1WPDjhoZMlsR2cFbt4NhmIJ4DX1H/tDCIv4NjQ="; }; nativeBuildInputs = [ @@ -47,6 +47,12 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dtest_data_dir=${testData}" ]; + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals (stdenv.cc.isGNU) [ + "-Wno-error=mismatched-new-delete" + ] + ); + nativeCheckInputs = [ gtest ];