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

font-{encodings,bh-{ttf,type1},mutt-misc}: refactor, move to pkgs/by-name & rename (#435433)

Browse Source
This commit is contained in:
jopejoe1
2025-08-26 22:35:45 +02:00
committed by GitHub
parent 3455c3038c a525a830f2
commit b95ac8a925
8 changed files with 172 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/fo/font-bh-ttf/package.nix
+38
View File
@@ -0,0 +1,38 @@
{
lib,
stdenv,
fetchurl,
mkfontscale,
writeScript,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-bh-ttf";
version = "1.0.4";
src = fetchurl {
url = "mirror://xorg/individual/font/font-bh-ttf-${finalAttrs.version}.tar.xz";
hash = "sha256-haX5DQDEjCsG/RJeqK28i47pdCnjB1CByHEJJu/sOlY=";
};
strictDeps = true;
nativeBuildInputs = [ mkfontscale ];
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 TrueType fonts";
homepage = "https://gitlab.freedesktop.org/xorg/font/bh-ttf";
license = lib.licenses.unfreeRedistributable;
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/fo/font-bh-type1/package.nix
+38
View File
@@ -0,0 +1,38 @@
{
lib,
stdenv,
fetchurl,
mkfontscale,
writeScript,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-bh-type1";
version = "1.0.4";
src = fetchurl {
url = "mirror://xorg/individual/font/font-bh-type1-${finalAttrs.version}.tar.xz";
hash = "sha256-Gd7D7Aar3mvt0QCUV56Si+Dw/DvbT76T9MaczkBtcqY=";
};
strictDeps = true;
nativeBuildInputs = [ mkfontscale ];
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 PostScript Type 1 fonts";
homepage = "https://gitlab.freedesktop.org/xorg/font/bh-type1";
license = lib.licenses.unfreeRedistributable;
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/fo/font-encodings/package.nix
+38
View File
@@ -0,0 +1,38 @@
{
lib,
stdenv,
fetchurl,
mkfontscale,
writeScript,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-encodings";
version = "1.1.0";
src = fetchurl {
url = "mirror://xorg/individual/font/encodings-${finalAttrs.version}.tar.xz";
hash = "sha256-n/E8YhdWz6EulfMrpIpbI4Oej1d9AEi+2mbGfatN6XU=";
};
strictDeps = true;
nativeBuildInputs = [ mkfontscale ];
passthru = {
updateScript = writeScript "update-${finalAttrs.pname}" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts
version="$(list-directory-versions --pname encodings \
--url https://xorg.freedesktop.org/releases/individual/font/ \
| sort -V | tail -n1)"
update-source-version ${finalAttrs.pname} "$version"
'';
};
meta = {
description = "Font encoding tables for libfontenc";
homepage = "https://gitlab.freedesktop.org/xorg/font/encodings";
license = lib.licenses.publicDomain;
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/fo/font-mutt-misc/package.nix
+42
View File
@@ -0,0 +1,42 @@
{
lib,
stdenv,
fetchurl,
bdftopcf,
mkfontscale,
writeScript,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-mutt-misc";
version = "1.0.4";
src = fetchurl {
url = "mirror://xorg/individual/font/font-mutt-misc-${finalAttrs.version}.tar.xz";
hash = "sha256-sSNZ9OEsI7z8tEi5GCl+l1+pG+9Sk9iNPCU0PMdouyQ=";
};
strictDeps = true;
nativeBuildInputs = [
bdftopcf
mkfontscale
];
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 = "ClearU pcf fonts";
homepage = "https://gitlab.freedesktop.org/xorg/font/mutt-misc";
license = lib.licenses.mit;
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
pkgs/servers/x11/xorg/default.nix
+8 -151
View File
@@ -3,6 +3,10 @@
lib,
bdftopcf,
font-alias,
font-bh-ttf,
font-bh-type1,
font-encodings,
font-mutt-misc,
font-util,
gccmakedep,
ico,
@@ -101,7 +105,11 @@ self: with self; {
xwininfo
xwud
;
encodings = font-encodings;
fontalias = font-alias;
fontbhttf = font-bh-ttf;
fontbhtype1 = font-bh-type1;
fontmuttmisc = font-mutt-misc;
fontutil = font-util;
libAppleWM = libapplewm;
libFS = libfs;
@@ -272,41 +280,6 @@ self: with self; {
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
encodings = callPackage (
{
stdenv,
pkg-config,
fetchurl,
mkfontscale,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "encodings";
version = "1.1.0";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/font/encodings-1.1.0.tar.xz";
sha256 = "0xg99nmpvik6vaz4h03xay7rx0r3bf5a8azkjlpa3ksn2xi3rwcz";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [
pkg-config
mkfontscale
];
buildInputs = [ ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
fontadobe100dpi = callPackage (
{
@@ -713,82 +686,6 @@ self: with self; {
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
fontbhttf = callPackage (
{
stdenv,
pkg-config,
fetchurl,
fontutil,
mkfontscale,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-bh-ttf";
version = "1.0.4";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/font/font-bh-ttf-1.0.4.tar.xz";
sha256 = "0misxkpjc2bir20m01z355sfk3lbpjnshphjzl32p364006zk9c5";
};
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!
fontbhtype1 = callPackage (
{
stdenv,
pkg-config,
fetchurl,
fontutil,
mkfontscale,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-bh-type1";
version = "1.0.4";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/font/font-bh-type1-1.0.4.tar.xz";
sha256 = "19kjdm0cx766yj9vwkyv7gyg1q4bjag5g500s7nnppmb0vnc7phr";
};
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!
fontbitstream100dpi = callPackage (
{
@@ -1420,46 +1317,6 @@ self: with self; {
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
fontmuttmisc = callPackage (
{
stdenv,
pkg-config,
fetchurl,
fontutil,
bdftopcf,
mkfontscale,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-mutt-misc";
version = "1.0.4";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/font/font-mutt-misc-1.0.4.tar.xz";
sha256 = "095vd33kqd157j6xi4sjxwdsjpwpgqliifa8nkybq8rcw7s5j8xi";
};
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!
fontschumachermisc = callPackage (
{
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+8
View File
@@ -319,6 +319,10 @@ print OUT <<EOF;
lib,
bdftopcf,
font-alias,
font-bh-ttf,
font-bh-type1,
font-encodings,
font-mutt-misc,
font-util,
gccmakedep,
ico,
@@ -417,7 +421,11 @@ self: with self; {
xwininfo
xwud
;
encodings = font-encodings;
fontalias = font-alias;
fontbhttf = font-bh-ttf;
fontbhtype1 = font-bh-type1;
fontmuttmisc = font-mutt-misc;
fontutil = font-util;
libAppleWM = libapplewm;
libFS = libfs;
pkgs/servers/x11/xorg/overrides.nix
-2
View File
@@ -1047,9 +1047,7 @@ self: super:
"fontadobeutopiatype1"
"fontadobeutopia100dpi"
"fontadobeutopia75dpi"
"fontbhtype1"
"fontibmtype1"
"fontbhttf"
"fontbh100dpi"
"fontbh75dpi"
pkgs/servers/x11/xorg/tarballs.list
-4
View File
@@ -99,7 +99,6 @@ mirror://xorg/individual/driver/xf86-video-vesa-2.6.0.tar.xz
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/encodings-1.1.0.tar.xz
mirror://xorg/individual/font/font-adobe-75dpi-1.0.4.tar.xz
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
@@ -110,8 +109,6 @@ 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-bh-ttf-1.0.4.tar.xz
mirror://xorg/individual/font/font-bh-type1-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
@@ -128,7 +125,6 @@ mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz
mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz
mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
mirror://xorg/individual/font/font-mutt-misc-1.0.4.tar.xz
mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz
mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz
mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz