gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

font-bh{,-lucidatypewriter}-{100,75}dpi: refactor, move to pkgs/by-name & rename from xorg namespace (#437127)

Browse Source
This commit is contained in:
jopejoe1
2025-09-23 09:50:46 +02:00
committed by GitHub
parent e57067b0ec ab33dd85d4
commit 49574a7d00
9 changed files with 225 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/fo/font-bh-100dpi/package.nix
+51
View File
@@ -0,0 +1,51 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
font-util,
bdftopcf,
mkfontscale,
writeScript,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-bh-100dpi";
version = "1.0.4";
src = fetchurl {
url = "mirror://xorg/individual/font/font-bh-100dpi-${finalAttrs.version}.tar.xz";
hash = "sha256-/Y9e/oSR+qvdJ0SAjT1Or9rlyD5hcBfH/d0nFtBJqx4=";
};
strictDeps = true;
nativeBuildInputs = [
pkg-config
bdftopcf
font-util
mkfontscale
];
buildInputs = [ font-util ];
configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
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 = "Luxi 100dpi pcf fonts";
homepage = "https://gitlab.freedesktop.org/xorg/font/bh-100dpi";
license = lib.licenses.unfreeRedistributable;
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/fo/font-bh-75dpi/package.nix
+51
View File
@@ -0,0 +1,51 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
font-util,
bdftopcf,
mkfontscale,
writeScript,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-bh-75dpi";
version = "1.0.4";
src = fetchurl {
url = "mirror://xorg/individual/font/font-bh-75dpi-${finalAttrs.version}.tar.xz";
hash = "sha256-YCbYwHNWPdPLtIeNAHbu2XDeur0hQjs7Yd2QRBuefNo=";
};
strictDeps = true;
nativeBuildInputs = [
pkg-config
bdftopcf
font-util
mkfontscale
];
buildInputs = [ font-util ];
configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
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 = "Luxi 75dpi pcf fonts";
homepage = "https://gitlab.freedesktop.org/xorg/font/bh-75dpi";
license = lib.licenses.unfreeRedistributable;
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix
+52
View File
@@ -0,0 +1,52 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
font-util,
bdftopcf,
mkfontscale,
writeScript,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-bh-lucidatypewriter-100dpi";
version = "1.0.4";
src = fetchurl {
url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-${finalAttrs.version}.tar.xz";
hash = "sha256-duwJ7aQJSinUe5HPWcProinI99HKa64qu7P5JeM96PI=";
};
strictDeps = true;
nativeBuildInputs = [
pkg-config
bdftopcf
font-util
mkfontscale
];
buildInputs = [ font-util ];
configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
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 = "Lucida Sans Typewriter 100dpi pcf fonts";
homepage = "https://gitlab.freedesktop.org/xorg/font/bh-lucidatypewriter-100dpi";
# no license just a copyright notice
license = lib.licenses.unfree;
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix
+52
View File
@@ -0,0 +1,52 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
font-util,
bdftopcf,
mkfontscale,
writeScript,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-bh-lucidatypewriter-75dpi";
version = "1.0.4";
src = fetchurl {
url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-${finalAttrs.version}.tar.xz";
hash = "sha256-hk4sOaxh8E9pP8LIqq7SSymMLNQCg87BLu5FnFY16PU=";
};
strictDeps = true;
nativeBuildInputs = [
pkg-config
bdftopcf
font-util
mkfontscale
];
buildInputs = [ font-util ];
configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
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 = "Lucida Sans Typewriter 75dpi pcf fonts";
homepage = "https://gitlab.freedesktop.org/xorg/font/bh-lucidatypewriter-75dpi";
# no license just a copyright notice
license = lib.licenses.unfree;
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/xd/xdummy/package.nix
+3 -3
View File
@@ -34,9 +34,9 @@ let
FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc"
FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc"
${lib.optionalString unfreeFonts ''
FontPath "${xorg.fontbhlucidatypewriter75dpi}/lib/X11/fonts/75dpi"
FontPath "${xorg.fontbhlucidatypewriter100dpi}/lib/X11/fonts/100dpi"
FontPath "${xorg.fontbh100dpi}/lib/X11/fonts/100dpi"
FontPath "${xorg.fontbhlucidatypewriter75dpi}/share/fonts/X11/75dpi"
FontPath "${xorg.fontbhlucidatypewriter100dpi}/share/fonts/X11/100dpi"
FontPath "${xorg.fontbh100dpi}/share/fonts/X11/100dpi"
''}
EndSection
pkgs/servers/x11/xorg/default.nix
+8 -164
View File
@@ -9,6 +9,10 @@
font-adobe-utopia-75dpi,
font-adobe-utopia-type1,
font-alias,
font-bh-100dpi,
font-bh-75dpi,
font-bh-lucidatypewriter-100dpi,
font-bh-lucidatypewriter-75dpi,
font-bh-ttf,
font-bh-type1,
font-encodings,
@@ -176,6 +180,10 @@ self: with self; {
fontadobeutopia75dpi = font-adobe-utopia-75dpi;
fontadobeutopiatype1 = font-adobe-utopia-type1;
fontalias = font-alias;
fontbh100dpi = font-bh-100dpi;
fontbh75dpi = font-bh-75dpi;
fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi;
fontbhlucidatypewriter75dpi = font-bh-lucidatypewriter-75dpi;
fontbhttf = font-bh-ttf;
fontbhtype1 = font-bh-type1;
fontmuttmisc = font-mutt-misc;
@@ -360,170 +368,6 @@ self: with self; {
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
fontbh100dpi = callPackage (
{
stdenv,
pkg-config,
fetchurl,
fontutil,
bdftopcf,
mkfontscale,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-bh-100dpi";
version = "1.0.4";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/font/font-bh-100dpi-1.0.4.tar.xz";
sha256 = "07mb9781c9yxzp3ifw317v4fbnmg9qyqv0244zfspylihkz5x3zx";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [
pkg-config
bdftopcf
fontutil
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!
fontbh75dpi = callPackage (
{
stdenv,
pkg-config,
fetchurl,
fontutil,
bdftopcf,
mkfontscale,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-bh-75dpi";
version = "1.0.4";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz";
sha256 = "1nkwkqdl946xc4xknhi1pnxdww6rxrv013c7nk5x6ganfg0dh9k0";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [
pkg-config
bdftopcf
fontutil
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!
fontbhlucidatypewriter100dpi = callPackage (
{
stdenv,
pkg-config,
fetchurl,
fontutil,
bdftopcf,
mkfontscale,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-bh-lucidatypewriter-100dpi";
version = "1.0.4";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz";
sha256 = "1wp87pijbydkpcmawsyas7vwhad2xg1mkkwigga2jjh9lknhkv3n";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [
pkg-config
bdftopcf
fontutil
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!
fontbhlucidatypewriter75dpi = callPackage (
{
stdenv,
pkg-config,
fetchurl,
fontutil,
bdftopcf,
mkfontscale,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-bh-lucidatypewriter-75dpi";
version = "1.0.4";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz";
sha256 = "1xg86mb9qigf5v0wx0q2shn8qaabsapamj627xllzw31mhwjqkl6";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [
pkg-config
bdftopcf
fontutil
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!
fontbitstream100dpi = callPackage (
{
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+8
View File
@@ -332,6 +332,10 @@ print OUT <<EOF;
font-adobe-utopia-75dpi,
font-adobe-utopia-type1,
font-alias,
font-bh-100dpi,
font-bh-75dpi,
font-bh-lucidatypewriter-100dpi,
font-bh-lucidatypewriter-75dpi,
font-bh-ttf,
font-bh-type1,
font-encodings,
@@ -499,6 +503,10 @@ self: with self; {
fontadobeutopia75dpi = font-adobe-utopia-75dpi;
fontadobeutopiatype1 = font-adobe-utopia-type1;
fontalias = font-alias;
fontbh100dpi = font-bh-100dpi;
fontbh75dpi = font-bh-75dpi;
fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi;
fontbhlucidatypewriter75dpi = font-bh-lucidatypewriter-75dpi;
fontbhttf = font-bh-ttf;
fontbhtype1 = font-bh-type1;
fontmuttmisc = font-mutt-misc;
pkgs/servers/x11/xorg/overrides.nix
-7
View File
@@ -894,13 +894,6 @@ self: super:
# unfree but redistributable
redist = [
"fontibmtype1"
"fontbh100dpi"
"fontbh75dpi"
# Bigelow & Holmes fonts
# https://www.x.org/releases/current/doc/xorg-docs/License.html#Bigelow_Holmes_Inc_and_URW_GmbH_Luxi_font_license
"fontbhlucidatypewriter100dpi"
"fontbhlucidatypewriter75dpi"
];
# unfree, possibly not redistributable
pkgs/servers/x11/xorg/tarballs.list
-4
View File
@@ -73,10 +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-bh-75dpi-1.0.4.tar.xz
mirror://xorg/individual/font/font-bh-100dpi-1.0.4.tar.xz
mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz
mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz
mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz
mirror://xorg/individual/font/font-bitstream-100dpi-1.0.4.tar.xz
mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz