From 41e0112fdfa44371a75013fe59fd807a57fed309 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 18 Aug 2025 11:05:16 +0200 Subject: [PATCH] font-alias: switch from fetchurl to fetchFromGitLab --- pkgs/by-name/fo/font-alias/package.nix | 36 +++++++++++++++----------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/fo/font-alias/package.nix b/pkgs/by-name/fo/font-alias/package.nix index 4a441d944c8f..7ce6cb893415 100644 --- a/pkgs/by-name/fo/font-alias/package.nix +++ b/pkgs/by-name/fo/font-alias/package.nix @@ -1,30 +1,36 @@ { lib, stdenv, - fetchurl, - writeScript, + fetchFromGitLab, + gitUpdater, + autoreconfHook, + font-util, + util-macros, }: stdenv.mkDerivation (finalAttrs: { pname = "font-alias"; version = "1.0.5"; - src = fetchurl { - url = "mirror://xorg/individual/font/font-alias-${finalAttrs.version}.tar.xz"; - hash = "sha256-n4niF7tz4ONjagpJP7+LfJlRVuDFPZoEdtIBtnwta24="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "font"; + repo = "alias"; + tag = "font-alias-${finalAttrs.version}"; + hash = "sha256-qglRNSt/PgFprpsvOVCeLMA+YagJw8DZMAfFdZ0m0/s="; }; + nativeBuildInputs = [ + autoreconfHook + font-util + util-macros + ]; + passthru = { - 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/font/ \ - | sort -V | tail -n1)" - - update-source-version ${finalAttrs.pname} "$version" - ''; + updateScript = gitUpdater { + rev-prefix = "font-alias-"; + }; }; meta = {