font-adobe-utopia-75dpi: refactor, move to pkgs/by-name and rename from xorg.fontadobeutopia75dpi

relevant changes:
- font is now in $out/share/fonts/X11 instead of $out/lib/X11/fonts
i have no idea why fonts would be in lib, so lets see if this breaks
anything
- font is now under the license adobeUtopia (recognised by SPDX) instead
of unfreeRedistributable

authored by quantenzitrone and committed by Alyssa Ross 98df87ea e21431a1

+55 -43
+51
pkgs/by-name/fo/font-adobe-utopia-75dpi/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + font-util, 7 + bdftopcf, 8 + mkfontscale, 9 + writeScript, 10 + }: 11 + stdenv.mkDerivation (finalAttrs: { 12 + pname = "font-adobe-utopia-75dpi"; 13 + version = "1.0.5"; 14 + 15 + src = fetchurl { 16 + url = "mirror://xorg/individual/font/font-adobe-utopia-75dpi-${finalAttrs.version}.tar.xz"; 17 + hash = "sha256-pyYkWTLQck+gxTjJkoEdY9WX5fU5KPQEjpyvViN5d2A="; 18 + }; 19 + 20 + strictDeps = true; 21 + 22 + nativeBuildInputs = [ 23 + pkg-config 24 + bdftopcf 25 + font-util 26 + mkfontscale 27 + ]; 28 + 29 + buildInputs = [ font-util ]; 30 + 31 + configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ]; 32 + 33 + passthru = { 34 + updateScript = writeScript "update-${finalAttrs.pname}" '' 35 + #!/usr/bin/env nix-shell 36 + #!nix-shell -i bash -p common-updater-scripts 37 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 38 + --url https://xorg.freedesktop.org/releases/individual/font/ \ 39 + | sort -V | tail -n1)" 40 + update-source-version ${finalAttrs.pname} "$version" 41 + ''; 42 + }; 43 + 44 + meta = { 45 + description = "Adobe Utopia 75dpi pcf fonts"; 46 + homepage = "https://gitlab.freedesktop.org/xorg/font/adobe-utopia-75dpi"; 47 + license = lib.licenses.adobeUtopia; 48 + maintainers = [ ]; 49 + platforms = lib.platforms.unix; 50 + }; 51 + })
+2 -41
pkgs/servers/x11/xorg/default.nix
··· 5 font-adobe-100dpi, 6 font-adobe-75dpi, 7 font-adobe-utopia-100dpi, 8 font-alias, 9 font-bh-ttf, 10 font-bh-type1, ··· 123 fontadobe100dpi = font-adobe-100dpi; 124 fontadobe75dpi = font-adobe-75dpi; 125 fontadobeutopia100dpi = font-adobe-utopia-100dpi; 126 fontalias = font-alias; 127 fontbhttf = font-bh-ttf; 128 fontbhtype1 = font-bh-type1; ··· 290 xorgproto 291 libXt 292 ]; 293 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 294 - meta = { 295 - pkgConfigModules = [ ]; 296 - platforms = lib.platforms.unix; 297 - }; 298 - }) 299 - ) { }; 300 - 301 - # THIS IS A GENERATED FILE. DO NOT EDIT! 302 - fontadobeutopia75dpi = callPackage ( 303 - { 304 - stdenv, 305 - pkg-config, 306 - fetchurl, 307 - fontutil, 308 - bdftopcf, 309 - mkfontscale, 310 - testers, 311 - }: 312 - stdenv.mkDerivation (finalAttrs: { 313 - pname = "font-adobe-utopia-75dpi"; 314 - version = "1.0.5"; 315 - builder = ./builder.sh; 316 - src = fetchurl { 317 - url = "mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz"; 318 - sha256 = "0q3pg4imdbwwiq2g8a1rypjrgmb33n0r5j9qqnh4ywnh69cj89m7"; 319 - }; 320 - hardeningDisable = [ 321 - "bindnow" 322 - "relro" 323 - ]; 324 - strictDeps = true; 325 - nativeBuildInputs = [ 326 - pkg-config 327 - bdftopcf 328 - fontutil 329 - mkfontscale 330 - ]; 331 - buildInputs = [ fontutil ]; 332 - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; 333 - postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; 334 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 335 meta = { 336 pkgConfigModules = [ ];
··· 5 font-adobe-100dpi, 6 font-adobe-75dpi, 7 font-adobe-utopia-100dpi, 8 + font-adobe-utopia-75dpi, 9 font-alias, 10 font-bh-ttf, 11 font-bh-type1, ··· 124 fontadobe100dpi = font-adobe-100dpi; 125 fontadobe75dpi = font-adobe-75dpi; 126 fontadobeutopia100dpi = font-adobe-utopia-100dpi; 127 + fontadobeutopia75dpi = font-adobe-utopia-75dpi; 128 fontalias = font-alias; 129 fontbhttf = font-bh-ttf; 130 fontbhtype1 = font-bh-type1; ··· 292 xorgproto 293 libXt 294 ]; 295 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 296 meta = { 297 pkgConfigModules = [ ];
+2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 321 font-adobe-100dpi, 322 font-adobe-75dpi, 323 font-adobe-utopia-100dpi, 324 font-alias, 325 font-bh-ttf, 326 font-bh-type1, ··· 439 fontadobe100dpi = font-adobe-100dpi; 440 fontadobe75dpi = font-adobe-75dpi; 441 fontadobeutopia100dpi = font-adobe-utopia-100dpi; 442 fontalias = font-alias; 443 fontbhttf = font-bh-ttf; 444 fontbhtype1 = font-bh-type1;
··· 321 font-adobe-100dpi, 322 font-adobe-75dpi, 323 font-adobe-utopia-100dpi, 324 + font-adobe-utopia-75dpi, 325 font-alias, 326 font-bh-ttf, 327 font-bh-type1, ··· 440 fontadobe100dpi = font-adobe-100dpi; 441 fontadobe75dpi = font-adobe-75dpi; 442 fontadobeutopia100dpi = font-adobe-utopia-100dpi; 443 + fontadobeutopia75dpi = font-adobe-utopia-75dpi; 444 fontalias = font-alias; 445 fontbhttf = font-bh-ttf; 446 fontbhtype1 = font-bh-type1;
-1
pkgs/servers/x11/xorg/overrides.nix
··· 1020 # unfree but redistributable 1021 redist = [ 1022 "fontadobeutopiatype1" 1023 - "fontadobeutopia75dpi" 1024 "fontibmtype1" 1025 "fontbh100dpi" 1026 "fontbh75dpi"
··· 1020 # unfree but redistributable 1021 redist = [ 1022 "fontadobeutopiatype1" 1023 "fontibmtype1" 1024 "fontbh100dpi" 1025 "fontbh75dpi"
-1
pkgs/servers/x11/xorg/tarballs.list
··· 93 mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz 94 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz 95 mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2 96 - mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz 97 mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz 98 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz 99 mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz
··· 93 mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz 94 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz 95 mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2 96 mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz 97 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz 98 mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz