xfsinfo: 1.0.7 -> 1.0.8, refactor & move to pkgs/by-name from xorg namespace

+60 -38
+56
pkgs/by-name/xf/xfsinfo/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + libfs, 8 + writeScript, 9 + }: 10 + stdenv.mkDerivation (finalAttrs: { 11 + pname = "xfsinfo"; 12 + version = "1.0.8"; 13 + 14 + src = fetchurl { 15 + url = "mirror://xorg/individual/app/xfsinfo-${finalAttrs.version}.tar.xz"; 16 + hash = "sha256-roBZK2Bj2pKOPQyBAjcJsvopoE/NpJ9sNjrFedl/I6I="; 17 + }; 18 + 19 + strictDeps = true; 20 + 21 + nativeBuildInputs = [ pkg-config ]; 22 + 23 + buildInputs = [ 24 + xorgproto 25 + libfs 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 font server information utility"; 41 + longDescription = '' 42 + xfsinfo is a utility for displaying information about an X font server. 43 + It is used to examine the capabilities of a server, the predefined values for various 44 + parameters used in communicating between clients and the server, and the font catalogues and 45 + alternate servers that are available. 46 + ''; 47 + homepage = "https://gitlab.freedesktop.org/xorg/app/xfsinfo"; 48 + license = with lib.licenses; [ 49 + mitOpenGroup 50 + hpndSellVariant 51 + ]; 52 + mainProgram = "xfsinfo"; 53 + maintainers = [ ]; 54 + platforms = lib.platforms.unix; 55 + }; 56 + })
+2 -36
pkgs/servers/x11/xorg/default.nix
··· 39 39 xcursor-themes, 40 40 xdriinfo, 41 41 xev, 42 + xfsinfo, 42 43 xkeyboard-config, 43 44 xlsatoms, 44 45 xlsclients, ··· 79 80 xcursorgen 80 81 xdriinfo 81 82 xev 83 + xfsinfo 82 84 xlsatoms 83 85 xlsclients 84 86 xlsfonts ··· 5879 5881 libXfont2 5880 5882 xorgproto 5881 5883 xtrans 5882 - ]; 5883 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 5884 - meta = { 5885 - pkgConfigModules = [ ]; 5886 - platforms = lib.platforms.unix; 5887 - }; 5888 - }) 5889 - ) { }; 5890 - 5891 - # THIS IS A GENERATED FILE. DO NOT EDIT! 5892 - xfsinfo = callPackage ( 5893 - { 5894 - stdenv, 5895 - pkg-config, 5896 - fetchurl, 5897 - libFS, 5898 - xorgproto, 5899 - testers, 5900 - }: 5901 - stdenv.mkDerivation (finalAttrs: { 5902 - pname = "xfsinfo"; 5903 - version = "1.0.7"; 5904 - builder = ./builder.sh; 5905 - src = fetchurl { 5906 - url = "mirror://xorg/individual/app/xfsinfo-1.0.7.tar.xz"; 5907 - sha256 = "0x48p4hk0lds2s8nwzgfl616r99s28ydx02zs7p1fxxs3i2wmwwj"; 5908 - }; 5909 - hardeningDisable = [ 5910 - "bindnow" 5911 - "relro" 5912 - ]; 5913 - strictDeps = true; 5914 - nativeBuildInputs = [ pkg-config ]; 5915 - buildInputs = [ 5916 - libFS 5917 - xorgproto 5918 5884 ]; 5919 5885 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 5920 5886 meta = {
+2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 332 332 xcursor-themes, 333 333 xdriinfo, 334 334 xev, 335 + xfsinfo, 335 336 xkeyboard-config, 336 337 xlsatoms, 337 338 xlsclients, ··· 372 373 xcursorgen 373 374 xdriinfo 374 375 xev 376 + xfsinfo 375 377 xlsatoms 376 378 xlsclients 377 379 xlsfonts
-1
pkgs/servers/x11/xorg/overrides.nix
··· 1112 1112 xfd = addMainProgram super.xfd { }; 1113 1113 xfontsel = addMainProgram super.xfontsel { }; 1114 1114 xfs = addMainProgram super.xfs { }; 1115 - xfsinfo = addMainProgram super.xfsinfo { }; 1116 1115 xgamma = addMainProgram super.xgamma { }; 1117 1116 xgc = addMainProgram super.xgc { }; 1118 1117 xhost = addMainProgram super.xhost { };
-1
pkgs/servers/x11/xorg/tarballs.list
··· 28 28 mirror://xorg/individual/app/xfd-1.1.4.tar.xz 29 29 mirror://xorg/individual/app/xfontsel-1.1.1.tar.xz 30 30 mirror://xorg/individual/app/xfs-1.2.2.tar.xz 31 - mirror://xorg/individual/app/xfsinfo-1.0.7.tar.xz 32 31 mirror://xorg/individual/app/xgamma-1.0.7.tar.xz 33 32 mirror://xorg/individual/app/xgc-1.0.6.tar.xz 34 33 mirror://xorg/individual/app/xhost-1.0.10.tar.xz