From b96325543a358a168dc1a7c0f2dcac02a7642dfd Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Wed, 27 Aug 2025 04:07:45 +0200 Subject: [PATCH 1/5] font-bitstream-100dpi: refactor, move to pkgs/by-name and rename from xorg.fontbitstream100dpi the package output doesn't change --- .../fo/font-bitstream-100dpi/package.nix | 56 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 42 +------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/tarballs.list | 1 - 4 files changed, 60 insertions(+), 41 deletions(-) create mode 100644 pkgs/by-name/fo/font-bitstream-100dpi/package.nix diff --git a/pkgs/by-name/fo/font-bitstream-100dpi/package.nix b/pkgs/by-name/fo/font-bitstream-100dpi/package.nix new file mode 100644 index 000000000000..70bdb81636af --- /dev/null +++ b/pkgs/by-name/fo/font-bitstream-100dpi/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + font-util, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-bitstream-100dpi"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-bitstream-100dpi-${finalAttrs.version}.tar.xz"; + hash = "sha256-LRzGgu/k9+vfX72Ilh2MoysnKZaHKGM96iChYnaQwac="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + bdftopcf + mkfontscale + ]; + + buildInputs = [ font-util ]; + + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + + 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" + ''; + }; + + meta = { + description = "Bitstream Charter and Terminal 100dpi pcf fonts"; + homepage = "https://gitlab.freedesktop.org/xorg/font/bitstream-100dpi"; + license = with lib.licenses; [ + hpnd + # TODO: change this license or remove this comment when + # https://github.com/spdx/license-list-XML/issues/2824 + # gets resolved + xfig + ]; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 8d98269160a1..a8b8c67d084f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -15,6 +15,7 @@ font-bh-lucidatypewriter-75dpi, font-bh-ttf, font-bh-type1, + font-bitstream-100dpi, font-cronyx-cyrillic, font-encodings, font-isas-misc, @@ -197,6 +198,7 @@ self: with self; { fontbhlucidatypewriter75dpi = font-bh-lucidatypewriter-75dpi; fontbhttf = font-bh-ttf; fontbhtype1 = font-bh-type1; + fontbitstream100dpi = font-bitstream-100dpi; fontcronyxcyrillic = font-cronyx-cyrillic; fontisasmisc = font-isas-misc; fontmicromisc = font-micro-misc; @@ -390,46 +392,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbitstream100dpi = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-bitstream-100dpi"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bitstream-100dpi-1.0.4.tar.xz"; - sha256 = "19y1j1v65890x8yn6a47jqljfax3ihfrd25xbzgypxz4xy1cc71d"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - bdftopcf - mkfontscale - ]; - buildInputs = [ fontutil ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! fontbitstream75dpi = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 0eed02f53618..d6ab785a0067 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -338,6 +338,7 @@ print OUT < Date: Wed, 27 Aug 2025 04:12:56 +0200 Subject: [PATCH 2/5] font-bitstream-75dpi: refactor, move to pkgs/by-name and rename from xorg.fontbitstream75dpi the package output doesn't change --- .../fo/font-bitstream-75dpi/package.nix | 56 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 42 +------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/tarballs.list | 1 - 4 files changed, 60 insertions(+), 41 deletions(-) create mode 100644 pkgs/by-name/fo/font-bitstream-75dpi/package.nix diff --git a/pkgs/by-name/fo/font-bitstream-75dpi/package.nix b/pkgs/by-name/fo/font-bitstream-75dpi/package.nix new file mode 100644 index 000000000000..acdae17bca71 --- /dev/null +++ b/pkgs/by-name/fo/font-bitstream-75dpi/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + font-util, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-bitstream-75dpi"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-bitstream-75dpi-${finalAttrs.version}.tar.xz"; + hash = "sha256-qus02HQkqcKwzw6FkHBMkMtbQsajtqDvnkZ273c7+CY="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + bdftopcf + mkfontscale + ]; + + buildInputs = [ font-util ]; + + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + + 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" + ''; + }; + + meta = { + description = "Bitstream Charter and Terminal 75dpi pcf fonts"; + homepage = "https://gitlab.freedesktop.org/xorg/font/bitstream-75dpi"; + license = with lib.licenses; [ + hpnd + # TODO: change this license or remove this comment when + # https://github.com/spdx/license-list-XML/issues/2824 + # gets resolved + xfig + ]; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index a8b8c67d084f..01e94ad1bc94 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -16,6 +16,7 @@ font-bh-ttf, font-bh-type1, font-bitstream-100dpi, + font-bitstream-75dpi, font-cronyx-cyrillic, font-encodings, font-isas-misc, @@ -199,6 +200,7 @@ self: with self; { fontbhttf = font-bh-ttf; fontbhtype1 = font-bh-type1; fontbitstream100dpi = font-bitstream-100dpi; + fontbitstream75dpi = font-bitstream-75dpi; fontcronyxcyrillic = font-cronyx-cyrillic; fontisasmisc = font-isas-misc; fontmicromisc = font-micro-misc; @@ -392,46 +394,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbitstream75dpi = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-bitstream-75dpi"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz"; - sha256 = "09pq7dvyyxj6kvps1dm3qr15pjwh9iq9118fryqc5a94fkc39sxa"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - bdftopcf - mkfontscale - ]; - buildInputs = [ fontutil ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! fontbitstreamspeedo = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index d6ab785a0067..9e968dfb4c5a 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -339,6 +339,7 @@ print OUT < Date: Wed, 27 Aug 2025 04:21:19 +0200 Subject: [PATCH 3/5] xorg.fontbitstreamspeedo: drop --- pkgs/servers/x11/xorg/default.nix | 38 ----------------------------- pkgs/servers/x11/xorg/overrides.nix | 6 +++++ pkgs/servers/x11/xorg/tarballs.list | 1 - 3 files changed, 6 insertions(+), 39 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 01e94ad1bc94..1c2bdcede515 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -394,44 +394,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbitstreamspeedo = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-bitstream-speedo"; - version = "1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz"; - sha256 = "0wmy58cd3k7w2j4v20icnfs8z3b61qj3vqdx958z18w00h9mzsmf"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - mkfontscale - ]; - buildInputs = [ fontutil ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! fontbitstreamtype1 = callPackage ( { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 717a4d81f91a..a805b53477e9 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -1,6 +1,7 @@ { callPackage, lib, + config, stdenv, makeWrapper, fetchurl, @@ -919,3 +920,8 @@ self: super: mapNamesToAttrs (setLicense lib.licenses.unfreeRedistributable) redist // mapNamesToAttrs (setLicense lib.licenses.unfree) unfree ) + +# deprecate some packages +// lib.optionalAttrs config.allowAliases { + fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; +} diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index a28379e51362..608ee10df38a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -73,7 +73,6 @@ mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz -mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz mirror://xorg/individual/font/font-bitstream-type1-1.0.4.tar.xz mirror://xorg/individual/font/font-cursor-misc-1.0.4.tar.xz mirror://xorg/individual/font/font-daewoo-misc-1.0.4.tar.xz From 4c4fd26ced7988897342f6386cc73af6d267c227 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Wed, 27 Aug 2025 04:43:53 +0200 Subject: [PATCH 4/5] font-bitstream-type1: refactor, move to pkgs/by-name and rename from xorg.fontbitstreamtype1 the package output doesn't change --- lib/licenses.nix | 5 ++ .../fo/font-bitstream-type1/package.nix | 60 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 21 ------- pkgs/servers/x11/xorg/tarballs.list | 1 - 6 files changed, 69 insertions(+), 60 deletions(-) create mode 100644 pkgs/by-name/fo/font-bitstream-type1/package.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index b736baf7c5fa..62796ef1963e 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -167,6 +167,11 @@ lib.mapAttrs mkLicense ( fullName = "Apache License 2.0"; }; + bitstreamCharter = { + spdxId = "Bitstream-Charter"; + fullName = "Bitstream Charter Font License"; + }; + bitstreamVera = { spdxId = "Bitstream-Vera"; fullName = "Bitstream Vera Font License"; diff --git a/pkgs/by-name/fo/font-bitstream-type1/package.nix b/pkgs/by-name/fo/font-bitstream-type1/package.nix new file mode 100644 index 000000000000..3e3d1eb6c35e --- /dev/null +++ b/pkgs/by-name/fo/font-bitstream-type1/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchurl, + mkfontscale, + fontforge, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-bitstream-type1"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-bitstream-type1-${finalAttrs.version}.tar.xz"; + hash = "sha256-3i8ji0zXLbQiigumeCnXait8A54imT1mpyLuOFJIxig="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + mkfontscale + fontforge + ]; + + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + + postBuild = '' + # convert Postscript (Type 1) font to otf + for i in $(find -type f -name '*.pfa' -o -name '*.pfb'); do + name=$(basename $i | cut -d. -f1) + fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$name.otf\")" + done + ''; + + postInstall = '' + # install the otf fonts + fontDir="$out/lib/X11/fonts/misc" + install -Dm444 -t "$fontDir" *.otf + mkfontscale "$fontDir" + ''; + + 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" + ''; + }; + + meta = { + description = "Bitstream Charter PostScript Type 1 and OpenType fonts"; + homepage = "https://gitlab.freedesktop.org/xorg/font/bitstream-type1"; + license = lib.licenses.bitstreamCharter; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1c2bdcede515..dc45ac9dc183 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -17,6 +17,7 @@ font-bh-type1, font-bitstream-100dpi, font-bitstream-75dpi, + font-bitstream-type1, font-cronyx-cyrillic, font-encodings, font-isas-misc, @@ -201,6 +202,7 @@ self: with self; { fontbhtype1 = font-bh-type1; fontbitstream100dpi = font-bitstream-100dpi; fontbitstream75dpi = font-bitstream-75dpi; + fontbitstreamtype1 = font-bitstream-type1; fontcronyxcyrillic = font-cronyx-cyrillic; fontisasmisc = font-isas-misc; fontmicromisc = font-micro-misc; @@ -394,44 +396,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbitstreamtype1 = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-bitstream-type1"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bitstream-type1-1.0.4.tar.xz"; - sha256 = "0a669193ivi2lxk3v692kq1pqavaswlpi9hbi8ib8bfp9j5j6byy"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - mkfontscale - ]; - buildInputs = [ fontutil ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! fontcursormisc = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9e968dfb4c5a..6e3c4e8b748a 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -340,6 +340,7 @@ print OUT < Date: Sat, 13 Sep 2025 23:53:11 +0200 Subject: [PATCH 5/5] font-bitstream-{100dpi,75dpi,type1}: move font output from $out/lib to $out/share --- pkgs/by-name/fo/font-bitstream-100dpi/package.nix | 2 +- pkgs/by-name/fo/font-bitstream-75dpi/package.nix | 2 +- pkgs/by-name/fo/font-bitstream-type1/package.nix | 4 +--- pkgs/servers/x11/xorg/overrides.nix | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/fo/font-bitstream-100dpi/package.nix b/pkgs/by-name/fo/font-bitstream-100dpi/package.nix index 70bdb81636af..380c99a83401 100644 --- a/pkgs/by-name/fo/font-bitstream-100dpi/package.nix +++ b/pkgs/by-name/fo/font-bitstream-100dpi/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ font-util ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ]; passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' diff --git a/pkgs/by-name/fo/font-bitstream-75dpi/package.nix b/pkgs/by-name/fo/font-bitstream-75dpi/package.nix index acdae17bca71..3dd6e249b0df 100644 --- a/pkgs/by-name/fo/font-bitstream-75dpi/package.nix +++ b/pkgs/by-name/fo/font-bitstream-75dpi/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ font-util ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ]; passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' diff --git a/pkgs/by-name/fo/font-bitstream-type1/package.nix b/pkgs/by-name/fo/font-bitstream-type1/package.nix index 3e3d1eb6c35e..0fe3b97a951a 100644 --- a/pkgs/by-name/fo/font-bitstream-type1/package.nix +++ b/pkgs/by-name/fo/font-bitstream-type1/package.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: { fontforge ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - postBuild = '' # convert Postscript (Type 1) font to otf for i in $(find -type f -name '*.pfa' -o -name '*.pfb'); do @@ -34,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' # install the otf fonts - fontDir="$out/lib/X11/fonts/misc" + fontDir="$out/share/fonts/X11/otf" install -Dm444 -t "$fontDir" *.otf mkfontscale "$fontDir" ''; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1952faf1bd14..215effdaa986 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -902,5 +902,5 @@ self: super: # deprecate some packages // lib.optionalAttrs config.allowAliases { - fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; + fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; # added 2025-09-24 }