util-macros: refactor (#434691)

authored by Arnout Engelen and committed by GitHub 037e6f1d 664c5bc4

+24 -60
+19 -26
pkgs/by-name/ut/util-macros/package.nix
··· 1 1 { 2 2 lib, 3 3 stdenv, 4 - fetchurl, 5 - pkg-config, 6 - automake, 7 - autoconf, 8 - libtool, 4 + fetchFromGitLab, 9 5 testers, 10 - writeScript, 6 + gitUpdater, 7 + autoreconfHook, 11 8 }: 12 9 stdenv.mkDerivation (finalAttrs: { 13 10 pname = "util-macros"; 14 11 version = "1.20.2"; 15 12 16 - src = fetchurl { 17 - url = "mirror://xorg/individual/util/util-macros-${finalAttrs.version}.tar.xz"; 18 - hash = "sha256-msJp66JPZy19ezV05L5fMz0T8Ep3EjA7GCGypRrILo4="; 13 + src = fetchFromGitLab { 14 + domain = "gitlab.freedesktop.org"; 15 + group = "xorg"; 16 + owner = "util"; 17 + repo = "macros"; 18 + tag = "util-macros-${finalAttrs.version}"; 19 + hash = "sha256-COIWe7GMfbk76/QUIRsN5yvjd6MEarI0j0M+Xa0WoKQ="; 19 20 }; 20 21 21 22 strictDeps = true; 22 23 23 - nativeBuildInputs = [ pkg-config ]; 24 - 25 - # not needed for releases, we propagate the needed tools 26 - propagatedNativeBuildInputs = [ 27 - automake 28 - autoconf 29 - libtool 30 - ]; 24 + nativeBuildInputs = [ autoreconfHook ]; 31 25 32 26 passthru = { 33 27 tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 34 - updateScript = writeScript "update-${finalAttrs.pname}" '' 35 - #!/usr/bin/env nix-shell 36 - #!nix-shell -i bash -p common-updater-scripts 37 - version="$(list-directory-versions --pname ${finalAttrs.pname} \ 38 - --url https://xorg.freedesktop.org/releases/individual/util/ \ 39 - | sort -V | tail -n1)" 40 - update-source-version ${finalAttrs.pname} "$version" 41 - ''; 28 + updateScript = gitUpdater { 29 + rev-prefix = "util-macros-"; 30 + ignoredVersions = "1_0_2"; 31 + }; 42 32 }; 43 33 44 34 meta = { ··· 48 38 hpndSellVariant 49 39 mit 50 40 ]; 51 - maintainers = [ ]; 41 + maintainers = with lib.maintainers; [ 42 + raboof 43 + jopejoe1 44 + ]; 52 45 pkgConfigModules = [ "xorg-macros" ]; 53 46 platforms = lib.platforms.unix; 54 47 };
+2 -2
pkgs/by-name/xl/xlogo/package.nix
··· 5 5 xorg, 6 6 autoreconfHook, 7 7 pkg-config, 8 - xorg-autoconf, 8 + util-macros, 9 9 }: 10 10 11 11 stdenv.mkDerivation rec { ··· 22 22 }; 23 23 24 24 nativeBuildInputs = [ 25 - xorg-autoconf 25 + util-macros 26 26 autoreconfHook 27 27 pkg-config 28 28 ];
-30
pkgs/by-name/xo/xorg-autoconf/package.nix
··· 1 - { 2 - lib, 3 - stdenv, 4 - autoreconfHook, 5 - fetchFromGitLab, 6 - }: 7 - 8 - stdenv.mkDerivation rec { 9 - pname = "xorg-autoconf"; 10 - version = "1.19.3"; 11 - 12 - src = fetchFromGitLab { 13 - domain = "gitlab.freedesktop.org"; 14 - group = "xorg"; 15 - owner = "util"; 16 - repo = "macros"; 17 - rev = "util-macros-${version}"; 18 - sha256 = "sha256-+yEMCjLztdY5LKTNjfhudDS0fdaOj4LKZ3YL5witFR4="; 19 - }; 20 - 21 - nativeBuildInputs = [ autoreconfHook ]; 22 - 23 - meta = with lib; { 24 - description = "GNU autoconf macros shared across X.Org projects"; 25 - homepage = "https://gitlab.freedesktop.org/xorg/util/macros"; 26 - maintainers = with maintainers; [ raboof ]; 27 - license = licenses.mit; 28 - platforms = platforms.unix; 29 - }; 30 - }
+2 -2
pkgs/by-name/xs/xscope/package.nix
··· 4 4 fetchFromGitLab, 5 5 pkg-config, 6 6 autoreconfHook, 7 - xorg-autoconf, 7 + util-macros, 8 8 xorg, 9 9 }: 10 10 ··· 23 23 nativeBuildInputs = [ 24 24 autoreconfHook 25 25 pkg-config 26 - xorg-autoconf 26 + util-macros 27 27 ]; 28 28 29 29 buildInputs = [
+1
pkgs/top-level/aliases.nix
··· 2219 2219 xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18 2220 2220 xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15 2221 2221 xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10 2222 + xorg-autoconf = util-macros; # Added 2025-08-18 2222 2223 xournal = throw "'xournal' has been removed due to lack of activity upstream and depending on gnome2. Consider using 'xournalpp' instead."; # Added 2024-12-06 2223 2224 xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18 2224 2225 xplayer = throw "xplayer has been removed as the upstream project was archived"; # Added 2024-12-27