diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-08-19 23:59:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-19 23:59:14 -0500 |
| commit | 03c11631ee36881446585da1c748fc6d463026aa (patch) | |
| tree | f47f84b3e111866efa2da2eddbbdca9deeca2b7a /pkgs | |
| parent | 21b7acbdb6f612b30a67d10c681a50a36c7f415b (diff) | |
| parent | 530c3a2d77710135212f41aa9407b2d642b167f1 (diff) | |
Merge pull request #250133 from marsam/update-girara
girara: 0.3.9 -> 0.4.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/girara/default.nix | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 20ea300d127c3..389359e0cd079 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, fetchurl -, fetchpatch2 +, fetchFromGitLab , meson , ninja , pkg-config @@ -14,28 +13,23 @@ , libiconv , json-glib , libintl +, zathura }: stdenv.mkDerivation rec { pname = "girara"; - version = "0.3.9"; + version = "0.4.0"; outputs = [ "out" "dev" ]; - src = fetchurl { - url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-DoqYykR/N17BHQ90GoLvAYluQ3odWPwUGRTacN6BiWU="; + src = fetchFromGitLab { + domain = "git.pwmt.org"; + owner = "pwmt"; + repo = "girara"; + rev = version; + sha256 = "sha256-dzWdiFGJ45JcH+wNwq2P3NZeWwHXAvXR1eJC85mYy7M="; }; - patches = [ - # Fix memory management bug revealed by GLib 2.76. - # https://git.pwmt.org/pwmt/girara/-/issues/17 - (fetchpatch2 { - url = "https://git.pwmt.org/pwmt/girara/-/commit/6926cc1234853ccf3010a1e2625aafcf462ed60e.patch"; - hash = "sha256-uayT6ikXtaBPxhZFyskShug3Tbvy2a9qimLRwdiAsic="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -75,6 +69,10 @@ stdenv.mkDerivation rec { meson test --print-errorlogs ''; + passthru.tests = { + inherit zathura; + }; + meta = with lib; { homepage = "https://git.pwmt.org/pwmt/girara"; description = "User interface library"; |