diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-01 11:40:12 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-01 11:40:12 +0100 |
| commit | bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86 (patch) | |
| tree | 8eb035cbab19794f6415cc460fac7226f7a58afc /nixpkgs/pkgs/development/libraries/zimlib | |
| parent | 66f707d69f1e423db5a35c2fe43b32781125a9af (diff) | |
| parent | 09c1497ce5d4ed4a0edfdd44450d3048074cb300 (diff) | |
| download | nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar.gz nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar.bz2 nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar.lz nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar.xz nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar.zst nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/zimlib')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/zimlib/default.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/zimlib/default.nix b/nixpkgs/pkgs/development/libraries/zimlib/default.nix index 40f8e670b526..fdcad63a279f 100644 --- a/nixpkgs/pkgs/development/libraries/zimlib/default.nix +++ b/nixpkgs/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 ]; |