xvinfo: refactor and move to pkgs/by-name from xorg namespace

+59 -46
+55
pkgs/by-name/xv/xvinfo/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + libx11, 8 + libxv, 9 + libxext, 10 + writeScript, 11 + }: 12 + stdenv.mkDerivation (finalAttrs: { 13 + pname = "xvinfo"; 14 + version = "1.1.5"; 15 + 16 + src = fetchurl { 17 + url = "mirror://xorg/individual/app/xvinfo-${finalAttrs.version}.tar.xz"; 18 + hash = "sha256-Pt5x7LJtlhTMvGkWcgKF6VosfgxeGbhXDqr3KtfFxAQ="; 19 + }; 20 + 21 + strictDeps = true; 22 + 23 + nativeBuildInputs = [ pkg-config ]; 24 + 25 + buildInputs = [ 26 + xorgproto 27 + libx11 28 + libxv 29 + libxext 30 + ]; 31 + 32 + passthru = { 33 + updateScript = writeScript "update-${finalAttrs.pname}" '' 34 + #!/usr/bin/env nix-shell 35 + #!nix-shell -i bash -p common-updater-scripts 36 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 37 + --url https://xorg.freedesktop.org/releases/individual/app/ \ 38 + | sort -V | tail -n1)" 39 + update-source-version ${finalAttrs.pname} "$version" 40 + ''; 41 + }; 42 + 43 + meta = { 44 + description = "Utility to print out X-Video extension adaptor information"; 45 + longDescription = '' 46 + xvinfo prints out the capabilities of any video adaptors associated with the display that are 47 + accessible through the X-Video extension. 48 + ''; 49 + homepage = "https://gitlab.freedesktop.org/xorg/app/xvinfo"; 50 + license = lib.licenses.x11; 51 + mainProgram = "xvinfo"; 52 + maintainers = [ ]; 53 + platforms = lib.platforms.unix; 54 + }; 55 + })
+2 -38
pkgs/servers/x11/xorg/default.nix
··· 53 53 xrandr, 54 54 xrefresh, 55 55 xtrans, 56 + xvinfo, 56 57 xwininfo, 57 58 xwud, 58 59 }: ··· 91 92 xrandr 92 93 xrefresh 93 94 xtrans 95 + xvinfo 94 96 xwininfo 95 97 xwud 96 98 ; ··· 6793 6795 libX11 6794 6796 libXt 6795 6797 libXTrap 6796 - ]; 6797 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 6798 - meta = { 6799 - pkgConfigModules = [ ]; 6800 - platforms = lib.platforms.unix; 6801 - }; 6802 - }) 6803 - ) { }; 6804 - 6805 - # THIS IS A GENERATED FILE. DO NOT EDIT! 6806 - xvinfo = callPackage ( 6807 - { 6808 - stdenv, 6809 - pkg-config, 6810 - fetchurl, 6811 - libX11, 6812 - xorgproto, 6813 - libXv, 6814 - testers, 6815 - }: 6816 - stdenv.mkDerivation (finalAttrs: { 6817 - pname = "xvinfo"; 6818 - version = "1.1.5"; 6819 - builder = ./builder.sh; 6820 - src = fetchurl { 6821 - url = "mirror://xorg/individual/app/xvinfo-1.1.5.tar.xz"; 6822 - sha256 = "0164qpbjmxxa1rbvh6ay1iz2qnp9hl1745k9pk6195kdnbn73piy"; 6823 - }; 6824 - hardeningDisable = [ 6825 - "bindnow" 6826 - "relro" 6827 - ]; 6828 - strictDeps = true; 6829 - nativeBuildInputs = [ pkg-config ]; 6830 - buildInputs = [ 6831 - libX11 6832 - xorgproto 6833 - libXv 6834 6798 ]; 6835 6799 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 6836 6800 meta = {
+2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 346 346 xrandr, 347 347 xrefresh, 348 348 xtrans, 349 + xvinfo, 349 350 xwininfo, 350 351 xwud, 351 352 }: ··· 384 385 xrandr 385 386 xrefresh 386 387 xtrans 388 + xvinfo 387 389 xwininfo 388 390 xwud 389 391 ;
-7
pkgs/servers/x11/xorg/overrides.nix
··· 685 685 686 686 xeyes = addMainProgram super.xeyes { }; 687 687 688 - xvinfo = super.xvinfo.overrideAttrs (attrs: { 689 - buildInputs = attrs.buildInputs ++ [ xorg.libXext ]; 690 - meta = attrs.meta // { 691 - mainProgram = "xvinfo"; 692 - }; 693 - }); 694 - 695 688 xkbcomp = super.xkbcomp.overrideAttrs (attrs: { 696 689 configureFlags = [ "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb" ]; 697 690 meta = attrs.meta // {
-1
pkgs/servers/x11/xorg/tarballs.list
··· 49 49 mirror://xorg/individual/app/xsm-1.0.6.tar.xz 50 50 mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz 51 51 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 52 - mirror://xorg/individual/app/xvinfo-1.1.5.tar.xz 53 52 mirror://xorg/individual/app/xwd-1.0.9.tar.xz 54 53 mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz 55 54 mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz