diff --git a/pkgs/by-name/al/almanah/package.nix b/pkgs/by-name/al/almanah/package.nix index 6cb95674d289..038127c1395c 100644 --- a/pkgs/by-name/al/almanah/package.nix +++ b/pkgs/by-name/al/almanah/package.nix @@ -28,44 +28,13 @@ stdenv.mkDerivation rec { pname = "almanah"; - version = "0.12.3"; + version = "0.12.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "lMpDQOxlGljP66APR49aPbTZnfrGakbQ2ZcFvmiPMFo="; + url = "mirror://gnome/sources/almanah/${lib.versions.majorMinor version}/almanah-${version}.tar.xz"; + sha256 = "DywW6Gkohf0lrX3Mw/UawrS4h2JOaOfqH2SulHkxlFI="; }; - patches = [ - # Fix build with meson 0.61 - # data/meson.build:2:5: ERROR: Function does not take positional arguments. - # Patch taken from https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/13 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/8c42a67695621d1e30cec933a04e633e6030bbaf.patch"; - sha256 = "qyqFgYSu4emFDG/Mjwz1bZb3v3/4gwQSKmGCoPPNYCQ="; - }) - - # Port to Gcr 4 - # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/14 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/cd44b476f4ffbf37c5d5f5b996ecd711db925576.patch"; - sha256 = "wJ1035NxgeTwUa0LoNcB6TSLxffoXBR3WbGAGkfggYY="; - }) - - # Port to GtkSourceView 4 - # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/15 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/0ba7f05cba7feaf2ae2c220596aead5dfc676675.patch"; - sha256 = "5uvHTPzQloEq8SVt3EnZ+8mziBdXsDmu/e92/RtyFzE="; - }) - - # Add missing GtkSourceView include - # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/23 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/533f30c7e60437cbea7ca5ae901e768922c1a710.patch"; - hash = "sha256-Ekhn4nRMC+fXLn4kqNwyCAg2cZru5QUcdzR1yJbcZGc="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils gettext @@ -94,7 +63,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "almanah"; versionPolicy = "none"; # it is quite odd }; };