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

Zitrone 6937e421 ba5254ab

+53 -32
+48
pkgs/by-name/xt/xtrans/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + writeScript, 7 + testers, 8 + }: 9 + stdenv.mkDerivation (finalAttrs: { 10 + pname = "xtrans"; 11 + version = "1.6.0"; 12 + 13 + src = fetchurl { 14 + url = "mirror://xorg/individual/lib/xtrans-${finalAttrs.version}.tar.xz"; 15 + hash = "sha256-+q/qFmvyRRoXPZ1ZM1KUDsZAQUXF0dpcITQjzk01npI="; 16 + }; 17 + 18 + strictDeps = true; 19 + 20 + nativeBuildInputs = [ pkg-config ]; 21 + 22 + passthru = { 23 + updateScript = writeScript "update-${finalAttrs.pname}" '' 24 + #!/usr/bin/env nix-shell 25 + #!nix-shell -i bash -p common-updater-scripts 26 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 27 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 28 + | sort -V | tail -n1)" 29 + update-source-version ${finalAttrs.pname} "$version" 30 + ''; 31 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 32 + }; 33 + 34 + meta = { 35 + description = "X Window System Protocols Transport layer shared code"; 36 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxtrans"; 37 + license = with lib.licenses; [ 38 + mitOpenGroup 39 + hpnd 40 + mit 41 + x11 42 + hpndSellVariant 43 + ]; 44 + maintainers = [ ]; 45 + pkgConfigModules = [ "xtrans" ]; 46 + platforms = lib.platforms.unix; 47 + }; 48 + })
+2 -31
pkgs/servers/x11/xorg/default.nix
··· 17 17 xorg-cf-files, 18 18 xorg-docs, 19 19 xorg-sgml-doctools, 20 + xtrans, 20 21 }: 21 22 22 23 self: with self; { ··· 29 30 makedepend 30 31 pixman 31 32 xbitmaps 33 + xtrans 32 34 ; 33 35 fontalias = font-alias; 34 36 fontutil = font-util; ··· 8098 8100 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 8099 8101 meta = { 8100 8102 pkgConfigModules = [ ]; 8101 - platforms = lib.platforms.unix; 8102 - }; 8103 - }) 8104 - ) { }; 8105 - 8106 - # THIS IS A GENERATED FILE. DO NOT EDIT! 8107 - xtrans = callPackage ( 8108 - { 8109 - stdenv, 8110 - pkg-config, 8111 - fetchurl, 8112 - testers, 8113 - }: 8114 - stdenv.mkDerivation (finalAttrs: { 8115 - pname = "xtrans"; 8116 - version = "1.6.0"; 8117 - builder = ./builder.sh; 8118 - src = fetchurl { 8119 - url = "mirror://xorg/individual/lib/xtrans-1.6.0.tar.xz"; 8120 - sha256 = "14ly6m6ww8rl45fdmlf58m0l1ihfji936ncx7lbiligjdcbfmbzs"; 8121 - }; 8122 - hardeningDisable = [ 8123 - "bindnow" 8124 - "relro" 8125 - ]; 8126 - strictDeps = true; 8127 - nativeBuildInputs = [ pkg-config ]; 8128 - buildInputs = [ ]; 8129 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 8130 - meta = { 8131 - pkgConfigModules = [ "xtrans" ]; 8132 8103 platforms = lib.platforms.unix; 8133 8104 }; 8134 8105 })
+3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 41 41 $pcMap{"pthread-stubs"} = "libpthreadstubs"; 42 42 $pcMap{"xbitmaps"} = "xbitmaps"; 43 43 $pcMap{"xcb-proto"} = "xcbproto"; 44 + $pcMap{"xtrans"} = "xtrans"; 44 45 $pcMap{"\$PIXMAN"} = "pixman"; 45 46 $pcMap{"\$RENDERPROTO"} = "xorgproto"; 46 47 $pcMap{"\$DRI3PROTO"} = "xorgproto"; ··· 281 282 xorg-cf-files, 282 283 xorg-docs, 283 284 xorg-sgml-doctools, 285 + xtrans, 284 286 }: 285 287 286 288 self: with self; { ··· 293 295 makedepend 294 296 pixman 295 297 xbitmaps 298 + xtrans 296 299 ; 297 300 fontalias = font-alias; 298 301 fontutil = font-util;
-1
pkgs/servers/x11/xorg/tarballs.list
··· 198 198 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 199 199 mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz 200 200 mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz 201 - mirror://xorg/individual/lib/xtrans-1.6.0.tar.xz 202 201 mirror://xorg/individual/proto/xorgproto-2024.1.tar.xz 203 202 mirror://xorg/individual/util/bdftopcf-1.1.2.tar.xz 204 203 mirror://xorg/individual/util/imake-1.0.10.tar.xz