font-encodings: refactor, move to pkgs/by-name and rename from xorg.encodings

relevant changes:
- remove some unneeded dependencies

Zitrone 2fa8f417 480d1d6e

+42 -36
+38
pkgs/by-name/fo/font-encodings/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + mkfontscale, 6 + writeScript, 7 + }: 8 + stdenv.mkDerivation (finalAttrs: { 9 + pname = "font-encodings"; 10 + version = "1.1.0"; 11 + 12 + src = fetchurl { 13 + url = "mirror://xorg/individual/font/encodings-${finalAttrs.version}.tar.xz"; 14 + hash = "sha256-n/E8YhdWz6EulfMrpIpbI4Oej1d9AEi+2mbGfatN6XU="; 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 encodings \ 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 = "Font encoding tables for libfontenc"; 33 + homepage = "https://gitlab.freedesktop.org/xorg/font/encodings"; 34 + license = lib.licenses.publicDomain; 35 + maintainers = [ ]; 36 + platforms = lib.platforms.unix; 37 + }; 38 + })
+2 -35
pkgs/servers/x11/xorg/default.nix
··· 3 lib, 4 bdftopcf, 5 font-alias, 6 font-util, 7 gccmakedep, 8 ico, ··· 85 xwininfo 86 xwud 87 ; 88 fontalias = font-alias; 89 fontutil = font-util; 90 libAppleWM = libapplewm; ··· 232 xorgproto 233 libXt 234 ]; 235 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 236 - meta = { 237 - pkgConfigModules = [ ]; 238 - platforms = lib.platforms.unix; 239 - }; 240 - }) 241 - ) { }; 242 - 243 - # THIS IS A GENERATED FILE. DO NOT EDIT! 244 - encodings = callPackage ( 245 - { 246 - stdenv, 247 - pkg-config, 248 - fetchurl, 249 - mkfontscale, 250 - testers, 251 - }: 252 - stdenv.mkDerivation (finalAttrs: { 253 - pname = "encodings"; 254 - version = "1.1.0"; 255 - builder = ./builder.sh; 256 - src = fetchurl { 257 - url = "mirror://xorg/individual/font/encodings-1.1.0.tar.xz"; 258 - sha256 = "0xg99nmpvik6vaz4h03xay7rx0r3bf5a8azkjlpa3ksn2xi3rwcz"; 259 - }; 260 - hardeningDisable = [ 261 - "bindnow" 262 - "relro" 263 - ]; 264 - strictDeps = true; 265 - nativeBuildInputs = [ 266 - pkg-config 267 - mkfontscale 268 - ]; 269 - buildInputs = [ ]; 270 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 271 meta = { 272 pkgConfigModules = [ ];
··· 3 lib, 4 bdftopcf, 5 font-alias, 6 + font-encodings, 7 font-util, 8 gccmakedep, 9 ico, ··· 86 xwininfo 87 xwud 88 ; 89 + encodings = font-encodings; 90 fontalias = font-alias; 91 fontutil = font-util; 92 libAppleWM = libapplewm; ··· 234 xorgproto 235 libXt 236 ]; 237 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 238 meta = { 239 pkgConfigModules = [ ];
+2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 296 lib, 297 bdftopcf, 298 font-alias, 299 font-util, 300 gccmakedep, 301 ico, ··· 378 xwininfo 379 xwud 380 ; 381 fontalias = font-alias; 382 fontutil = font-util; 383 libAppleWM = libapplewm;
··· 296 lib, 297 bdftopcf, 298 font-alias, 299 + font-encodings, 300 font-util, 301 gccmakedep, 302 ico, ··· 379 xwininfo 380 xwud 381 ; 382 + encodings = font-encodings; 383 fontalias = font-alias; 384 fontutil = font-util; 385 libAppleWM = libapplewm;
-1
pkgs/servers/x11/xorg/tarballs.list
··· 105 mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz 106 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz 107 mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2 108 - mirror://xorg/individual/font/encodings-1.1.0.tar.xz 109 mirror://xorg/individual/font/font-adobe-75dpi-1.0.4.tar.xz 110 mirror://xorg/individual/font/font-adobe-100dpi-1.0.4.tar.xz 111 mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz
··· 105 mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz 106 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz 107 mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2 108 mirror://xorg/individual/font/font-adobe-75dpi-1.0.4.tar.xz 109 mirror://xorg/individual/font/font-adobe-100dpi-1.0.4.tar.xz 110 mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz