From 52df62ec9b04cf644043de500e884a85467de252 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 12 Sep 2020 15:37:15 +0200 Subject: [PATCH] =?UTF-8?q?almanah:=200.12.0=20=E2=86=92=200.12.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/almanah/-/compare/0.12.0...0.12.2 --- pkgs/applications/misc/almanah/default.nix | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index ff878578526..7d5c468ab97 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , atk , cairo , desktop-file-utils @@ -17,36 +16,29 @@ , libxml2 , meson , ninja -, pkgconfig +, pkg-config +, python3 , sqlite , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "almanah"; - version = "0.12.0"; + version = "0.12.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09rxx4s4c34d1axza6ayss33v78p44r9bpx058shllh1sf5avpcb"; + sha256 = "IWYOnOu0C9uQ9k1dgWkJ6Kv+o/jY+6Llfsi4PusHE24="; }; - patches = [ - # Fix gpgme detection - # https://gitlab.gnome.org/GNOME/almanah/merge_requests/7 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/almanah/commit/4b979c4145ef2fbceebb3849a70df1d0ceb1bb93.patch"; - sha256 = "0wwkgqr5vi597j734xq0fwgk1zpcabp8wi8b1lnb1ksnqfi3wwxb"; - }) - ]; - nativeBuildInputs = [ desktop-file-utils gettext libxml2 meson ninja - pkgconfig + pkg-config + python3 wrapGAppsHook ];