libxcb-keysyms: refactor, move to pkgs/by-name and rename from xorg.xcbutilkeysyms

relevant changes:
- remove m4 from nativeBuildInputs and gperf from buildInputs, as they
both don't seem to be required

+61 -50
+56
pkgs/by-name/li/libxcb-keysyms/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + libxcb, 7 + xorgproto, 8 + writeScript, 9 + testers, 10 + }: 11 + stdenv.mkDerivation (finalAttrs: { 12 + pname = "libxcb-keysyms"; 13 + version = "0.4.1"; 14 + 15 + outputs = [ 16 + "out" 17 + "dev" 18 + ]; 19 + 20 + src = fetchurl { 21 + url = "mirror://xorg/individual/xcb/xcb-util-keysyms-${finalAttrs.version}.tar.xz"; 22 + hash = "sha256-fCYKUpRBKu1CnfHaL4r9O9B7fLo/7HcvuhWmE6bVxjg="; 23 + }; 24 + 25 + strictDeps = true; 26 + 27 + nativeBuildInputs = [ pkg-config ]; 28 + 29 + buildInputs = [ 30 + libxcb 31 + xorgproto 32 + ]; 33 + 34 + propagatedBuildInputs = [ libxcb ]; 35 + 36 + passthru = { 37 + updateScript = writeScript "update-${finalAttrs.pname}" '' 38 + #!/usr/bin/env nix-shell 39 + #!nix-shell -i bash -p common-updater-scripts 40 + version="$(list-directory-versions --pname xcb-util-keysyms \ 41 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 42 + | sort -V | tail -n1)" 43 + update-source-version ${finalAttrs.pname} "$version" 44 + ''; 45 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 46 + }; 47 + 48 + meta = { 49 + description = "Standard X key constants and conversion to/from keycodes"; 50 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms"; 51 + license = lib.licenses.x11; 52 + maintainers = [ ]; 53 + pkgConfigModules = [ "xcb-keysyms" ]; 54 + platforms = lib.platforms.unix; 55 + }; 56 + })
+2 -42
pkgs/servers/x11/xorg/default.nix
··· 18 18 libxcb, 19 19 libxcb-errors, 20 20 libxcb-image, 21 + libxcb-keysyms, 21 22 libxcb-util, 22 23 libxcvt, 23 24 libxcursor, ··· 106 107 xcbproto = xcb-proto; 107 108 xcbutilerrors = libxcb-errors; 108 109 xcbutilimage = libxcb-image; 110 + xcbutilkeysyms = libxcb-keysyms; 109 111 xcbutil = libxcb-util; 110 112 xkeyboardconfig = xkeyboard-config; 111 113 xorgcffiles = xorg-cf-files; ··· 3239 3241 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3240 3242 meta = { 3241 3243 pkgConfigModules = [ "xcb-cursor" ]; 3242 - platforms = lib.platforms.unix; 3243 - }; 3244 - }) 3245 - ) { }; 3246 - 3247 - # THIS IS A GENERATED FILE. DO NOT EDIT! 3248 - xcbutilkeysyms = callPackage ( 3249 - { 3250 - stdenv, 3251 - pkg-config, 3252 - fetchurl, 3253 - gperf, 3254 - libxcb, 3255 - xorgproto, 3256 - m4, 3257 - testers, 3258 - }: 3259 - stdenv.mkDerivation (finalAttrs: { 3260 - pname = "xcb-util-keysyms"; 3261 - version = "0.4.1"; 3262 - builder = ./builder.sh; 3263 - src = fetchurl { 3264 - url = "mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz"; 3265 - sha256 = "0f66snk179hmp8ppgv1zp9y7pl1vzn52znpikm1fsaj1ji90l9kw"; 3266 - }; 3267 - hardeningDisable = [ 3268 - "bindnow" 3269 - "relro" 3270 - ]; 3271 - strictDeps = true; 3272 - nativeBuildInputs = [ 3273 - pkg-config 3274 - m4 3275 - ]; 3276 - buildInputs = [ 3277 - gperf 3278 - libxcb 3279 - xorgproto 3280 - ]; 3281 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3282 - meta = { 3283 - pkgConfigModules = [ "xcb-keysyms" ]; 3284 3244 platforms = lib.platforms.unix; 3285 3245 }; 3286 3246 })
+3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 51 51 $pcMap{"xcb-errors"} = "xcbutilerrors"; 52 52 $pcMap{"xcb-event"} = "xcbutil"; 53 53 $pcMap{"xcb-image"} = "xcbutilimage"; 54 + $pcMap{"xcb-keysyms"} = "xcbutilkeysyms"; 54 55 $pcMap{"xcb-proto"} = "xcbproto"; 55 56 $pcMap{"xcb-util"} = "xcbutil"; 56 57 $pcMap{"xcursor"} = "libXcursor"; ··· 317 318 libxcb, 318 319 libxcb-errors, 319 320 libxcb-image, 321 + libxcb-keysyms, 320 322 libxcb-util, 321 323 libxcvt, 322 324 libxcursor, ··· 405 407 xcbproto = xcb-proto; 406 408 xcbutilerrors = libxcb-errors; 407 409 xcbutilimage = libxcb-image; 410 + xcbutilkeysyms = libxcb-keysyms; 408 411 xcbutil = libxcb-util; 409 412 xkeyboardconfig = xkeyboard-config; 410 413 xorgcffiles = xorg-cf-files;
-7
pkgs/servers/x11/xorg/overrides.nix
··· 447 447 }; 448 448 }); 449 449 450 - xcbutilkeysyms = super.xcbutilkeysyms.overrideAttrs (attrs: { 451 - outputs = [ 452 - "out" 453 - "dev" 454 - ]; # mainly to get rid of propagating others 455 - }); 456 - 457 450 xcbutilrenderutil = super.xcbutilrenderutil.overrideAttrs (attrs: { 458 451 outputs = [ 459 452 "out"
-1
pkgs/servers/x11/xorg/tarballs.list
··· 1 - mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz 2 1 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz 3 2 mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz 4 3 mirror://xorg/individual/app/appres-1.0.7.tar.xz