font-adobe-utopia-type1: refactor, move to pkgs/by-name and rename from xorg.fontadobeutopiatype1

relevant changes:
- remove some dependencies that dont't seem to be needed
- 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 9ef0609c 98df87ea

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