font-alias: renamed and refactored from xorg.fontalias

NixOS · Dec 30, 2024 · cfd2737 · cfd2737
1 parent 6dc2639
commit cfd2737
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 21 deletions.
diff --git a/lib/licenses.nix b/lib/licenses.nix
@@ -432,6 +432,11 @@ lib.mapAttrs mkLicense ({
     fullName = "Common Public License 1.0";
   };
 
+  cronyx = {
+    spdxId = "Cronyx";
+    fullName = "Cronyx License";
+  };
+
   curl = {
     spdxId = "curl";
     fullName = "curl License";

diff --git a/pkgs/by-name/fo/font-alias/package.nix b/pkgs/by-name/fo/font-alias/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  writeScript,
+}:
+
+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=";
+  };
+
+  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 | tail -n1)"
+
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Common aliases for Xorg fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/alias";
+    license = with lib.licenses; [cronyx mit];
+    maintainers = [];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
@@ -9,6 +9,7 @@ self: with self; {
 
   inherit pixman;
   inherit luit;
+  fontalias = font-alias;
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   appres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt, testers }: stdenv.mkDerivation (finalAttrs: {
@@ -220,26 +221,6 @@ self: with self; {
     };
   })) {};
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontalias = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: {
-    pname = "font-alias";
-    version = "1.0.5";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = "mirror://xorg/individual/font/font-alias-1.0.5.tar.xz";
-      sha256 = "0vkb5mybc0fjfq29lgf5w1b536bwifzkyj8ad9iy7q3kpcby52cz";
-    };
-    hardeningDisable = [ "bindnow" "relro" ];
-    strictDeps = true;
-    nativeBuildInputs = [ pkg-config ];
-    buildInputs = [ ];
-    passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-    meta = {
-      pkgConfigModules = [ ];
-      platforms = lib.platforms.unix;
-    };
-  })) {};
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontarabicmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: {
     pname = "font-arabic-misc";

diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -261,13 +261,15 @@
 {
   lib,
   pixman,
+  font-alias,
   luit,
 }:
 
 self: with self; {
 
   inherit pixman;
   inherit luit;
+  fontalias = font-alias;
 
 EOF
 

diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
@@ -132,7 +132,6 @@ mirror://xorg/individual/font/font-adobe-100dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz
-mirror://xorg/individual/font/font-alias-1.0.5.tar.xz
 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-100dpi-1.0.4.tar.xz