util-macros: refactor (#434691)

pkgs/by-name/ut/util-macros/package.nix

···
 {
   lib,
   stdenv,
-  fetchurl,
-  pkg-config,
-  automake,
-  autoconf,
-  libtool,
+  fetchFromGitLab,
   testers,
-  writeScript,
+  gitUpdater,
+  autoreconfHook,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "util-macros";
   version = "1.20.2";
 
-  src = fetchurl {
-    url = "mirror://xorg/individual/util/util-macros-${finalAttrs.version}.tar.xz";
-    hash = "sha256-msJp66JPZy19ezV05L5fMz0T8Ep3EjA7GCGypRrILo4=";
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "util";
+    repo = "macros";
+    tag = "util-macros-${finalAttrs.version}";
+    hash = "sha256-COIWe7GMfbk76/QUIRsN5yvjd6MEarI0j0M+Xa0WoKQ=";
   };
 
   strictDeps = true;
 
-  nativeBuildInputs = [ pkg-config ];
-
-  # not needed for releases, we propagate the needed tools
-  propagatedNativeBuildInputs = [
-    automake
-    autoconf
-    libtool
-  ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   passthru = {
     tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-    updateScript = writeScript "update-${finalAttrs.pname}" ''
-      #!/usr/bin/env nix-shell
-      #!nix-shell -i bash -p common-updater-scripts
-      version="$(list-directory-versions --pname ${finalAttrs.pname} \
-        --url https://xorg.freedesktop.org/releases/individual/util/ \
-        | sort -V | tail -n1)"
-      update-source-version ${finalAttrs.pname} "$version"
-    '';
+    updateScript = gitUpdater {
+      rev-prefix = "util-macros-";
+      ignoredVersions = "1_0_2";
+    };
   };
 
   meta = {
···
       hpndSellVariant
       mit
     ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      raboof
+      jopejoe1
+    ];
     pkgConfigModules = [ "xorg-macros" ];
     platforms = lib.platforms.unix;
   };

pkgs/by-name/xl/xlogo/package.nix

···
   xorg,
   autoreconfHook,
   pkg-config,
-  xorg-autoconf,
+  util-macros,
 }:
 
 stdenv.mkDerivation rec {
···
   };
 
   nativeBuildInputs = [
-    xorg-autoconf
+    util-macros
     autoreconfHook
     pkg-config
   ];

pkgs/by-name/xo/xorg-autoconf/package.nix

···
-{
-  lib,
-  stdenv,
-  autoreconfHook,
-  fetchFromGitLab,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "xorg-autoconf";
-  version = "1.19.3";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.freedesktop.org";
-    group = "xorg";
-    owner = "util";
-    repo = "macros";
-    rev = "util-macros-${version}";
-    sha256 = "sha256-+yEMCjLztdY5LKTNjfhudDS0fdaOj4LKZ3YL5witFR4=";
-  };
-
-  nativeBuildInputs = [ autoreconfHook ];
-
-  meta = with lib; {
-    description = "GNU autoconf macros shared across X.Org projects";
-    homepage = "https://gitlab.freedesktop.org/xorg/util/macros";
-    maintainers = with maintainers; [ raboof ];
-    license = licenses.mit;
-    platforms = platforms.unix;
-  };
-}

pkgs/by-name/xs/xscope/package.nix

···
   fetchFromGitLab,
   pkg-config,
   autoreconfHook,
-  xorg-autoconf,
+  util-macros,
   xorg,
 }:
 
···
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-    xorg-autoconf
+    util-macros
   ];
 
   buildInputs = [

pkgs/top-level/aliases.nix

···
   xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18
   xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15
   xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10
+  xorg-autoconf = util-macros; # Added 2025-08-18
   xournal = throw "'xournal' has been removed due to lack of activity upstream and depending on gnome2. Consider using 'xournalpp' instead."; # Added 2024-12-06
   xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18
   xplayer = throw "xplayer has been removed as the upstream project was archived"; # Added 2024-12-27