diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/zimlib | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/zimlib')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/zimlib/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/zimlib/default.nix b/nixpkgs/pkgs/development/libraries/zimlib/default.nix index 9f8e357d3ab0..56438f8e1735 100644 --- a/nixpkgs/pkgs/development/libraries/zimlib/default.nix +++ b/nixpkgs/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 ]; |