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

+61 -50
+57
pkgs/by-name/xr/xrandr/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + libx11, 8 + libxrandr, 9 + libxrender, 10 + writeScript, 11 + }: 12 + stdenv.mkDerivation (finalAttrs: { 13 + pname = "xrandr"; 14 + version = "1.5.3"; 15 + 16 + src = fetchurl { 17 + url = "mirror://xorg/individual/app/xrandr-${finalAttrs.version}.tar.xz"; 18 + hash = "sha256-+N11Zq23QUf6uZZGgLa7re6Hz0Bqf8/1Fxil5pSbhBw="; 19 + }; 20 + 21 + strictDeps = true; 22 + 23 + nativeBuildInputs = [ pkg-config ]; 24 + 25 + buildInputs = [ 26 + xorgproto 27 + libx11 28 + libxrandr 29 + libxrender 30 + ]; 31 + 32 + postInstall = '' 33 + # remove useless xkeystone script 34 + # it is written in a language not packaged in nixpkgs 35 + rm $out/bin/xkeystone 36 + ''; 37 + 38 + passthru = { 39 + updateScript = writeScript "update-${finalAttrs.pname}" '' 40 + #!/usr/bin/env nix-shell 41 + #!nix-shell -i bash -p common-updater-scripts 42 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 43 + --url https://xorg.freedesktop.org/releases/individual/app/ \ 44 + | sort -V | tail -n1)" 45 + update-source-version ${finalAttrs.pname} "$version" 46 + ''; 47 + }; 48 + 49 + meta = { 50 + description = "Command line interface to X11 Resize, Rotate, and Reflect (RandR) extension"; 51 + homepage = "https://gitlab.freedesktop.org/xorg/app/xrandr"; 52 + license = lib.licenses.hpndSellVariant; 53 + mainProgram = "xrandr"; 54 + maintainers = [ ]; 55 + platforms = lib.platforms.unix; 56 + }; 57 + })
+2 -40
pkgs/servers/x11/xorg/default.nix
··· 50 50 xorgproto, 51 51 xorg-sgml-doctools, 52 52 xprop, 53 + xrandr, 53 54 xrefresh, 54 55 xtrans, 55 56 xwininfo, ··· 87 88 xmodmap 88 89 xorgproto 89 90 xprop 91 + xrandr 90 92 xrefresh 91 93 xtrans 92 94 xwininfo ··· 6545 6547 libX11 6546 6548 libXmu 6547 6549 xorgproto 6548 - ]; 6549 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 6550 - meta = { 6551 - pkgConfigModules = [ ]; 6552 - platforms = lib.platforms.unix; 6553 - }; 6554 - }) 6555 - ) { }; 6556 - 6557 - # THIS IS A GENERATED FILE. DO NOT EDIT! 6558 - xrandr = callPackage ( 6559 - { 6560 - stdenv, 6561 - pkg-config, 6562 - fetchurl, 6563 - libX11, 6564 - xorgproto, 6565 - libXrandr, 6566 - libXrender, 6567 - testers, 6568 - }: 6569 - stdenv.mkDerivation (finalAttrs: { 6570 - pname = "xrandr"; 6571 - version = "1.5.3"; 6572 - builder = ./builder.sh; 6573 - src = fetchurl { 6574 - url = "mirror://xorg/individual/app/xrandr-1.5.3.tar.xz"; 6575 - sha256 = "0744kfafd98q2zswyzva837qgvmdpfv80ilnp7x4fhdpmmk7bpgq"; 6576 - }; 6577 - hardeningDisable = [ 6578 - "bindnow" 6579 - "relro" 6580 - ]; 6581 - strictDeps = true; 6582 - nativeBuildInputs = [ pkg-config ]; 6583 - buildInputs = [ 6584 - libX11 6585 - xorgproto 6586 - libXrandr 6587 - libXrender 6588 6550 ]; 6589 6551 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 6590 6552 meta = {
+2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 343 343 xorgproto, 344 344 xorg-sgml-doctools, 345 345 xprop, 346 + xrandr, 346 347 xrefresh, 347 348 xtrans, 348 349 xwininfo, ··· 380 381 xmodmap 381 382 xorgproto 382 383 xprop 384 + xrandr 383 385 xrefresh 384 386 xtrans 385 387 xwininfo
-9
pkgs/servers/x11/xorg/overrides.nix
··· 1133 1133 }; 1134 1134 }); 1135 1135 1136 - xrandr = super.xrandr.overrideAttrs (attrs: { 1137 - postInstall = '' 1138 - rm $out/bin/xkeystone 1139 - ''; 1140 - meta = attrs.meta // { 1141 - mainProgram = "xrandr"; 1142 - }; 1143 - }); 1144 - 1145 1136 xset = addMainProgram super.xset { }; 1146 1137 xsetroot = addMainProgram super.xsetroot { }; 1147 1138 xsm = addMainProgram super.xsm { };
-1
pkgs/servers/x11/xorg/tarballs.list
··· 43 43 mirror://xorg/individual/app/xmessage-1.0.7.tar.xz 44 44 mirror://xorg/individual/app/xmore-1.0.4.tar.xz 45 45 mirror://xorg/individual/app/xpr-1.2.0.tar.xz 46 - mirror://xorg/individual/app/xrandr-1.5.3.tar.xz 47 46 mirror://xorg/individual/app/xrdb-1.2.2.tar.xz 48 47 mirror://xorg/individual/app/xset-1.2.5.tar.xz 49 48 mirror://xorg/individual/app/xsetroot-1.1.3.tar.xz