From 991cfacaba4ecd96e96b34f7345a26939672c796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 27 May 2026 11:08:45 -0700
Subject: [PATCH] cantarell-fonts: 0.303.1 -> 0.311

Changelog: https://gitlab.gnome.org/GNOME/cantarell-fonts/-/blob/0.311/NEWS
---
 pkgs/by-name/ca/cantarell-fonts/package.nix | 34 +++++++++------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ca/cantarell-fonts/package.nix b/pkgs/by-name/ca/cantarell-fonts/package.nix
index b0c3a47edf08..53b17c94f1ef 100644
--- a/pkgs/by-name/ca/cantarell-fonts/package.nix
+++ b/pkgs/by-name/ca/cantarell-fonts/package.nix
@@ -1,50 +1,44 @@
 {
   stdenv,
   lib,
-  fetchurl,
+  fetchFromGitLab,
   meson,
   ninja,
   python3,
   gettext,
-  appstream-glib,
-  gnome,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation rec {
   pname = "cantarell-fonts";
-  version = "0.303.1";
+  version = "0.311";
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/cantarell-fonts/${lib.versions.majorMinor version}/cantarell-fonts-${version}.tar.xz";
-    sha256 = "+UY6BlnGPlfjgf3XU88ZKSJTlcW0kTWYlCR2GDBTBBE=";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "cantarell-fonts";
+    tag = version;
+    hash = "sha256-FR53OZxJ7WRUDqMB2GriQ3UOxozWwbFiz3/9VaUWYrc=";
   };
 
   nativeBuildInputs = [
     meson
     ninja
-    python3
-    python3.pkgs.psautohint
+    python3.pkgs.afdko # for otfautohint
     python3.pkgs.cffsubr
-    python3.pkgs.statmake
     python3.pkgs.ufo2ft
-    python3.pkgs.setuptools
-    python3.pkgs.ufolib2
+    python3.pkgs.uharfbuzz
     gettext
-    appstream-glib
   ];
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "sha256-OjHj4h3n+/ozbrLaiH4bGppQ+2LA2RB/sZQVO9EPOEw=";
-
   passthru = {
-    updateScript = gnome.updateScript {
-      packageName = pname;
-    };
+    updateScript = gitUpdater { };
   };
 
   meta = {
+    changelog = "https://gitlab.gnome.org/GNOME/cantarell-fonts/-/blob/${src.tag}/NEWS";
     description = "Default typeface used in the user interface of GNOME since version 3.0";
+    homepage = "https://cantarell.gnome.org/";
     platforms = lib.platforms.all;
     license = lib.licenses.ofl;
     maintainers = [ ];