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

relevant changes:
- remove gperf and xorgproto from buildInputs at they don't seem to be
required (no relevant changes with diff --recursive)

+67 -54
+62
pkgs/by-name/li/libxcb-errors/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + m4, 7 + python3, 8 + xcbproto, 9 + libxcb, 10 + writeScript, 11 + testers, 12 + }: 13 + stdenv.mkDerivation (finalAttrs: { 14 + pname = "libxcb-errors"; 15 + version = "1.0.1"; 16 + 17 + outputs = [ 18 + "out" 19 + "dev" 20 + ]; 21 + 22 + src = fetchurl { 23 + url = "mirror://xorg/individual/xcb/xcb-util-errors-${finalAttrs.version}.tar.xz"; 24 + hash = "sha256-VijIe5hCWa2Se6zYpClYMZw2vfSwZYh4A8nYIPuA81c="; 25 + }; 26 + 27 + strictDeps = true; 28 + 29 + nativeBuildInputs = [ 30 + pkg-config 31 + m4 32 + python3 33 + ]; 34 + 35 + buildInputs = [ 36 + xcbproto 37 + libxcb 38 + ]; 39 + 40 + propagatedBuildInputs = [ libxcb ]; 41 + 42 + passthru = { 43 + updateScript = writeScript "update-${finalAttrs.pname}" '' 44 + #!/usr/bin/env nix-shell 45 + #!nix-shell -i bash -p common-updater-scripts 46 + version="$(list-directory-versions --pname xcb-util-errors \ 47 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 48 + | sort -V | tail -n1)" 49 + update-source-version ${finalAttrs.pname} "$version" 50 + ''; 51 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 52 + }; 53 + 54 + meta = { 55 + description = "XCB utility library that gives human readable names to error, event & request codes"; 56 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-errors"; 57 + license = lib.licenses.x11; 58 + maintainers = [ ]; 59 + pkgConfigModules = [ "xcb-errors" ]; 60 + platforms = lib.platforms.unix; 61 + }; 62 + })
+2 -46
pkgs/servers/x11/xorg/default.nix
··· 16 libx11, 17 libxau, 18 libxcb, 19 libxcb-util, 20 libxcvt, 21 libxcursor, ··· 102 libXv = libxv; 103 utilmacros = util-macros; 104 xcbproto = xcb-proto; 105 xcbutil = libxcb-util; 106 xkeyboardconfig = xkeyboard-config; 107 xorgcffiles = xorg-cf-files; ··· 3235 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3236 meta = { 3237 pkgConfigModules = [ "xcb-cursor" ]; 3238 - platforms = lib.platforms.unix; 3239 - }; 3240 - }) 3241 - ) { }; 3242 - 3243 - # THIS IS A GENERATED FILE. DO NOT EDIT! 3244 - xcbutilerrors = callPackage ( 3245 - { 3246 - stdenv, 3247 - pkg-config, 3248 - fetchurl, 3249 - gperf, 3250 - libxcb, 3251 - xcbproto, 3252 - xorgproto, 3253 - m4, 3254 - python3, 3255 - testers, 3256 - }: 3257 - stdenv.mkDerivation (finalAttrs: { 3258 - pname = "xcb-util-errors"; 3259 - version = "1.0.1"; 3260 - builder = ./builder.sh; 3261 - src = fetchurl { 3262 - url = "mirror://xorg/individual/xcb/xcb-util-errors-1.0.1.tar.xz"; 3263 - sha256 = "0mzkh3xj1n690dw8hrdhyjykd71ib0ls9n5cgf9asna2k1xwha2n"; 3264 - }; 3265 - hardeningDisable = [ 3266 - "bindnow" 3267 - "relro" 3268 - ]; 3269 - strictDeps = true; 3270 - nativeBuildInputs = [ 3271 - pkg-config 3272 - m4 3273 - python3 3274 - ]; 3275 - buildInputs = [ 3276 - gperf 3277 - libxcb 3278 - xcbproto 3279 - xorgproto 3280 - ]; 3281 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3282 - meta = { 3283 - pkgConfigModules = [ "xcb-errors" ]; 3284 platforms = lib.platforms.unix; 3285 }; 3286 })
··· 16 libx11, 17 libxau, 18 libxcb, 19 + libxcb-errors, 20 libxcb-util, 21 libxcvt, 22 libxcursor, ··· 103 libXv = libxv; 104 utilmacros = util-macros; 105 xcbproto = xcb-proto; 106 + xcbutilerrors = libxcb-errors; 107 xcbutil = libxcb-util; 108 xkeyboardconfig = xkeyboard-config; 109 xorgcffiles = xorg-cf-files; ··· 3237 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3238 meta = { 3239 pkgConfigModules = [ "xcb-cursor" ]; 3240 platforms = lib.platforms.unix; 3241 }; 3242 })
+3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 48 $pcMap{"xbitmaps"} = "xbitmaps"; 49 $pcMap{"xcb-atom"} = "xcbutil"; 50 $pcMap{"xcb-aux"} = "xcbutil"; 51 $pcMap{"xcb-event"} = "xcbutil"; 52 $pcMap{"xcb-proto"} = "xcbproto"; 53 $pcMap{"xcb-util"} = "xcbutil"; ··· 313 libx11, 314 libxau, 315 libxcb, 316 libxcb-util, 317 libxcvt, 318 libxcursor, ··· 399 libXv = libxv; 400 utilmacros = util-macros; 401 xcbproto = xcb-proto; 402 xcbutil = libxcb-util; 403 xkeyboardconfig = xkeyboard-config; 404 xorgcffiles = xorg-cf-files;
··· 48 $pcMap{"xbitmaps"} = "xbitmaps"; 49 $pcMap{"xcb-atom"} = "xcbutil"; 50 $pcMap{"xcb-aux"} = "xcbutil"; 51 + $pcMap{"xcb-errors"} = "xcbutilerrors"; 52 $pcMap{"xcb-event"} = "xcbutil"; 53 $pcMap{"xcb-proto"} = "xcbproto"; 54 $pcMap{"xcb-util"} = "xcbutil"; ··· 314 libx11, 315 libxau, 316 libxcb, 317 + libxcb-errors, 318 libxcb-util, 319 libxcvt, 320 libxcursor, ··· 401 libXv = libxv; 402 utilmacros = util-macros; 403 xcbproto = xcb-proto; 404 + xcbutilerrors = libxcb-errors; 405 xcbutil = libxcb-util; 406 xkeyboardconfig = xkeyboard-config; 407 xorgcffiles = xorg-cf-files;
-7
pkgs/servers/x11/xorg/overrides.nix
··· 437 438 xcalc = addMainProgram super.xcalc { }; 439 440 - xcbutilerrors = super.xcbutilerrors.overrideAttrs (attrs: { 441 - outputs = [ 442 - "out" 443 - "dev" 444 - ]; # mainly to get rid of propagating others 445 - }); 446 - 447 xcbutilcursor = super.xcbutilcursor.overrideAttrs (attrs: { 448 outputs = [ 449 "out"
··· 437 438 xcalc = addMainProgram super.xcalc { }; 439 440 xcbutilcursor = super.xcbutilcursor.overrideAttrs (attrs: { 441 outputs = [ 442 "out"
-1
pkgs/servers/x11/xorg/tarballs.list
··· 1 - mirror://xorg/individual/xcb/xcb-util-errors-1.0.1.tar.xz 2 mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz 3 mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz 4 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz
··· 1 mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz 2 mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz 3 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz