From ef63c16ac7419b9d5c21eb73d691396d3debcf36 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 6 Nov 2024 06:36:13 +0000
Subject: [PATCH 1/2] pixman: 0.43.4 -> 0.44.2

Changes:
- https://lists.x.org/archives/xorg-announce/2024-November/003548.html
- https://lists.x.org/archives/xorg-announce/2024-December/003561.html
---
 pkgs/by-name/pi/pixman/package.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/pi/pixman/package.nix b/pkgs/by-name/pi/pixman/package.nix
index 0678539b79a3..616b34d35ab1 100644
--- a/pkgs/by-name/pi/pixman/package.nix
+++ b/pkgs/by-name/pi/pixman/package.nix
@@ -24,14 +24,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pixman";
-  version = "0.43.4";
+  version = "0.44.2";
 
   src = fetchurl {
     urls = with finalAttrs; [
       "mirror://xorg/individual/lib/${pname}-${version}.tar.gz"
       "https://cairographics.org/releases/${pname}-${version}.tar.gz"
     ];
-    hash = "sha256-oGJNuQGAx923n8epFRCT3DfGRtjDjT8jL3Z89kuFoiY=";
+    hash = "sha256-Y0kGHOGjOKtpUrkhlNGwN3RyJEII1H/yW++G/HGXNGY=";
   };
 
   # Raise test timeout, 120s can be slightly exceeded on slower hardware
@@ -50,11 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
   # architectures and requires used to disable them:
   #   https://gitlab.freedesktop.org/pixman/pixman/-/issues/88
   mesonAutoFeatures = "auto";
-  mesonFlags = [
-    "-Diwmmxt=disabled"
-  ]
-  # Disable until https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 is resolved
-  ++ lib.optional (stdenv.hostPlatform.isAarch64 && !stdenv.cc.isGNU) "-Da64-neon=disabled";
 
   preConfigure = ''
     # https://gitlab.freedesktop.org/pixman/pixman/-/issues/62

From 41655b61823fd129a379e25335f4ff7eb1c4b220 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 4 Dec 2024 06:31:57 +0000
Subject: [PATCH 2/2] pixman: apply nixfmt

---
 pkgs/by-name/pi/pixman/package.nix | 56 +++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/pi/pixman/package.nix b/pkgs/by-name/pi/pixman/package.nix
index 616b34d35ab1..a78fafad9275 100644
--- a/pkgs/by-name/pi/pixman/package.nix
+++ b/pkgs/by-name/pi/pixman/package.nix
@@ -1,25 +1,26 @@
-{ lib
-, stdenv
-, fetchurl
-, meson
-, ninja
-, pkg-config
-, libpng
-, glib /*just passthru*/
+{
+  lib,
+  stdenv,
+  fetchurl,
+  meson,
+  ninja,
+  pkg-config,
+  libpng,
+  glib, # just passthru
 
-# for passthru.tests
-, cairo
-, qemu
-, scribus
-, tigervnc
-, wlroots_0_17
-, wlroots_0_18
-, xwayland
+  # for passthru.tests
+  cairo,
+  qemu,
+  scribus,
+  tigervnc,
+  wlroots_0_17,
+  wlroots_0_18,
+  xwayland,
 
-, gitUpdater
-, testers
+  gitUpdater,
+  testers,
 
-, __flattenIncludeHackHook
+  __flattenIncludeHackHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,7 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   separateDebugInfo = !stdenv.hostPlatform.isStatic;
 
-  nativeBuildInputs = [ meson ninja pkg-config __flattenIncludeHackHook ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    __flattenIncludeHackHook
+  ];
 
   buildInputs = [ libpng ];
 
@@ -62,7 +68,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests = {
-      inherit cairo qemu scribus tigervnc wlroots_0_17 wlroots_0_18 xwayland;
+      inherit
+        cairo
+        qemu
+        scribus
+        tigervnc
+        wlroots_0_17
+        wlroots_0_18
+        xwayland
+        ;
       pkg-config = testers.hasPkgConfigModules {
         package = finalAttrs.finalPackage;
       };