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

relevant changes:
- remove gperf from buildInputs as it does not seem to be needed

+67 -52
+62
pkgs/by-name/li/libxcb-image/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + m4, 7 + xorgproto, 8 + libxcb, 9 + libxcb-util, 10 + writeScript, 11 + testers, 12 + }: 13 + stdenv.mkDerivation (finalAttrs: { 14 + pname = "libxcb-image"; 15 + version = "0.4.1"; 16 + 17 + outputs = [ 18 + "out" 19 + "dev" 20 + ]; 21 + 22 + src = fetchurl { 23 + url = "mirror://xorg/individual/xcb/xcb-util-image-${finalAttrs.version}.tar.xz"; 24 + hash = "sha256-zK2O5drbEnH9RyetFNm9d6ZOUFYIdmxOmCZ9mu3kDT0="; 25 + }; 26 + 27 + strictDeps = true; 28 + 29 + nativeBuildInputs = [ 30 + pkg-config 31 + m4 32 + ]; 33 + 34 + buildInputs = [ 35 + xorgproto 36 + libxcb 37 + libxcb-util 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-image \ 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 port of Xlib's XImage and XShmImage functions."; 56 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-image"; 57 + license = lib.licenses.x11; 58 + maintainers = [ ]; 59 + pkgConfigModules = [ "xcb-image" ]; 60 + platforms = lib.platforms.unix; 61 + }; 62 + })
+2 -44
pkgs/servers/x11/xorg/default.nix
··· 17 17 libxau, 18 18 libxcb, 19 19 libxcb-errors, 20 + libxcb-image, 20 21 libxcb-util, 21 22 libxcvt, 22 23 libxcursor, ··· 104 105 utilmacros = util-macros; 105 106 xcbproto = xcb-proto; 106 107 xcbutilerrors = libxcb-errors; 108 + xcbutilimage = libxcb-image; 107 109 xcbutil = libxcb-util; 108 110 xkeyboardconfig = xkeyboard-config; 109 111 xorgcffiles = xorg-cf-files; ··· 3237 3239 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3238 3240 meta = { 3239 3241 pkgConfigModules = [ "xcb-cursor" ]; 3240 - platforms = lib.platforms.unix; 3241 - }; 3242 - }) 3243 - ) { }; 3244 - 3245 - # THIS IS A GENERATED FILE. DO NOT EDIT! 3246 - xcbutilimage = callPackage ( 3247 - { 3248 - stdenv, 3249 - pkg-config, 3250 - fetchurl, 3251 - gperf, 3252 - libxcb, 3253 - xcbutil, 3254 - xorgproto, 3255 - m4, 3256 - testers, 3257 - }: 3258 - stdenv.mkDerivation (finalAttrs: { 3259 - pname = "xcb-util-image"; 3260 - version = "0.4.1"; 3261 - builder = ./builder.sh; 3262 - src = fetchurl { 3263 - url = "mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz"; 3264 - sha256 = "0g8dwknrlz96k176qxh8ar84x9kpppci9b978zyp24nvvbjqxbfc"; 3265 - }; 3266 - hardeningDisable = [ 3267 - "bindnow" 3268 - "relro" 3269 - ]; 3270 - strictDeps = true; 3271 - nativeBuildInputs = [ 3272 - pkg-config 3273 - m4 3274 - ]; 3275 - buildInputs = [ 3276 - gperf 3277 - libxcb 3278 - xcbutil 3279 - xorgproto 3280 - ]; 3281 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3282 - meta = { 3283 - pkgConfigModules = [ "xcb-image" ]; 3284 3242 platforms = lib.platforms.unix; 3285 3243 }; 3286 3244 })
+3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 50 50 $pcMap{"xcb-aux"} = "xcbutil"; 51 51 $pcMap{"xcb-errors"} = "xcbutilerrors"; 52 52 $pcMap{"xcb-event"} = "xcbutil"; 53 + $pcMap{"xcb-image"} = "xcbutilimage"; 53 54 $pcMap{"xcb-proto"} = "xcbproto"; 54 55 $pcMap{"xcb-util"} = "xcbutil"; 55 56 $pcMap{"xcursor"} = "libXcursor"; ··· 315 316 libxau, 316 317 libxcb, 317 318 libxcb-errors, 319 + libxcb-image, 318 320 libxcb-util, 319 321 libxcvt, 320 322 libxcursor, ··· 402 404 utilmacros = util-macros; 403 405 xcbproto = xcb-proto; 404 406 xcbutilerrors = libxcb-errors; 407 + xcbutilimage = libxcb-image; 405 408 xcbutil = libxcb-util; 406 409 xkeyboardconfig = xkeyboard-config; 407 410 xorgcffiles = xorg-cf-files;
-7
pkgs/servers/x11/xorg/overrides.nix
··· 447 447 }; 448 448 }); 449 449 450 - xcbutilimage = super.xcbutilimage.overrideAttrs (attrs: { 451 - outputs = [ 452 - "out" 453 - "dev" 454 - ]; # mainly to get rid of propagating others 455 - }); 456 - 457 450 xcbutilkeysyms = super.xcbutilkeysyms.overrideAttrs (attrs: { 458 451 outputs = [ 459 452 "out"
-1
pkgs/servers/x11/xorg/tarballs.list
··· 1 - mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz 2 1 mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz 3 2 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz 4 3 mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz