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

+58 -40
+54
pkgs/by-name/xe/xev/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + libx11, 8 + libxrandr, 9 + writeScript, 10 + }: 11 + stdenv.mkDerivation (finalAttrs: { 12 + pname = "xev"; 13 + version = "1.2.6"; 14 + 15 + src = fetchurl { 16 + url = "mirror://xorg/individual/app/xev-${finalAttrs.version}.tar.xz"; 17 + hash = "sha256-YeHF4AismXOsp83d826d90EOdwg7Aw6wT03HN8UYB9c="; 18 + }; 19 + 20 + strictDeps = true; 21 + nativeBuildInputs = [ pkg-config ]; 22 + buildInputs = [ 23 + xorgproto 24 + libx11 25 + libxrandr 26 + ]; 27 + 28 + passthru = { 29 + updateScript = writeScript "update-${finalAttrs.pname}" '' 30 + #!/usr/bin/env nix-shell 31 + #!nix-shell -i bash -p common-updater-scripts 32 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 33 + --url https://xorg.freedesktop.org/releases/individual/app/ \ 34 + | sort -V | tail -n1)" 35 + update-source-version ${finalAttrs.pname} "$version" 36 + ''; 37 + }; 38 + 39 + meta = { 40 + description = "X event monitor"; 41 + longDescription = '' 42 + xev creates a window and then asks the X server to send it X11 events whenever anything 43 + happens to the window (such as it being moved, resized, typed in, clicked in, etc.). 44 + You can also attach it to an existing window. It is useful for seeing what causes events to 45 + occur and to display the information that they contain; it is essentially a debugging and 46 + development tool, and should not be needed in normal usage. 47 + ''; 48 + homepage = "https://gitlab.freedesktop.org/xorg/app/xev"; 49 + license = lib.licenses.x11; 50 + mainProgram = "xev"; 51 + maintainers = [ ]; 52 + platforms = lib.platforms.unix; 53 + }; 54 + })
+2 -38
pkgs/servers/x11/xorg/default.nix
··· 38 38 xcursorgen, 39 39 xcursor-themes, 40 40 xdriinfo, 41 + xev, 41 42 xkeyboard-config, 42 43 xlsatoms, 43 44 xlsclients, ··· 77 78 xcmsdb 78 79 xcursorgen 79 80 xdriinfo 81 + xev 80 82 xlsatoms 81 83 xlsclients 82 84 xlsfonts ··· 3759 3761 libXxf86dga 3760 3762 libXxf86misc 3761 3763 libXxf86vm 3762 - ]; 3763 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3764 - meta = { 3765 - pkgConfigModules = [ ]; 3766 - platforms = lib.platforms.unix; 3767 - }; 3768 - }) 3769 - ) { }; 3770 - 3771 - # THIS IS A GENERATED FILE. DO NOT EDIT! 3772 - xev = callPackage ( 3773 - { 3774 - stdenv, 3775 - pkg-config, 3776 - fetchurl, 3777 - libX11, 3778 - xorgproto, 3779 - libXrandr, 3780 - testers, 3781 - }: 3782 - stdenv.mkDerivation (finalAttrs: { 3783 - pname = "xev"; 3784 - version = "1.2.6"; 3785 - builder = ./builder.sh; 3786 - src = fetchurl { 3787 - url = "mirror://xorg/individual/app/xev-1.2.6.tar.xz"; 3788 - sha256 = "1mq7332kgisd9yq0w0rv11vhwhgpkmpg7pfdlyn776dc13hcbqb1"; 3789 - }; 3790 - hardeningDisable = [ 3791 - "bindnow" 3792 - "relro" 3793 - ]; 3794 - strictDeps = true; 3795 - nativeBuildInputs = [ pkg-config ]; 3796 - buildInputs = [ 3797 - libX11 3798 - xorgproto 3799 - libXrandr 3800 3764 ]; 3801 3765 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3802 3766 meta = {
+2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 331 331 xcursorgen, 332 332 xcursor-themes, 333 333 xdriinfo, 334 + xev, 334 335 xkeyboard-config, 335 336 xlsatoms, 336 337 xlsclients, ··· 370 371 xcmsdb 371 372 xcursorgen 372 373 xdriinfo 374 + xev 373 375 xlsatoms 374 376 xlsclients 375 377 xlsfonts
-1
pkgs/servers/x11/xorg/overrides.nix
··· 683 683 }; 684 684 }); 685 685 686 - xev = addMainProgram super.xev { }; 687 686 xeyes = addMainProgram super.xeyes { }; 688 687 689 688 xvinfo = super.xvinfo.overrideAttrs (attrs: {
-1
pkgs/servers/x11/xorg/tarballs.list
··· 24 24 mirror://xorg/individual/app/xconsole-1.1.0.tar.xz 25 25 mirror://xorg/individual/app/xdm-1.1.17.tar.xz 26 26 mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz 27 - mirror://xorg/individual/app/xev-1.2.6.tar.xz 28 27 mirror://xorg/individual/app/xeyes-1.3.0.tar.xz 29 28 mirror://xorg/individual/app/xfd-1.1.4.tar.xz 30 29 mirror://xorg/individual/app/xfontsel-1.1.1.tar.xz