libxdmcp: refactor, move to pkgs/by-name and rename from xorg.libXdmcp

authored by Zitrone and committed by Alyssa Ross 50b5017b 0ee81df3

+55 -44
+50
pkgs/by-name/li/libxdmcp/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + writeScript, 8 + testers, 9 + }: 10 + stdenv.mkDerivation (finalAttrs: { 11 + pname = "libxdmcp"; 12 + version = "1.1.5"; 13 + 14 + outputs = [ 15 + "out" 16 + "dev" 17 + "doc" 18 + ]; 19 + 20 + src = fetchurl { 21 + url = "mirror://xorg/individual/lib/libXdmcp-${finalAttrs.version}.tar.xz"; 22 + hash = "sha256-2KUiKCjDratwrfaaVYPx0y617OBDBPf4OStqNTqiIow="; 23 + }; 24 + 25 + strictDeps = true; 26 + 27 + nativeBuildInputs = [ pkg-config ]; 28 + buildInputs = [ xorgproto ]; 29 + 30 + passthru = { 31 + updateScript = writeScript "update-${finalAttrs.pname}" '' 32 + #!/usr/bin/env nix-shell 33 + #!nix-shell -i bash -p common-updater-scripts 34 + version="$(list-directory-versions --pname libXdmcp \ 35 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 36 + | sort -V | tail -n1)" 37 + update-source-version ${finalAttrs.pname} "$version" 38 + ''; 39 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 40 + }; 41 + 42 + meta = { 43 + description = "X Display Manager Control Protocol library"; 44 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxdmcp"; 45 + license = lib.licenses.mitOpenGroup; 46 + maintainers = [ ]; 47 + pkgConfigModules = [ "xdmcp" ]; 48 + platforms = lib.platforms.unix; 49 + }; 50 + })
+2 -32
pkgs/servers/x11/xorg/default.nix
··· 9 libpciaccess, 10 libpthread-stubs, 11 libxcvt, 12 lndir, 13 luit, 14 makedepend, ··· 45 fontalias = font-alias; 46 fontutil = font-util; 47 libpthreadstubs = libpthread-stubs; 48 utilmacros = util-macros; 49 xcbproto = xcb-proto; 50 xkeyboardconfig = xkeyboard-config; ··· 2220 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2221 meta = { 2222 pkgConfigModules = [ "xdamage" ]; 2223 - platforms = lib.platforms.unix; 2224 - }; 2225 - }) 2226 - ) { }; 2227 - 2228 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2229 - libXdmcp = callPackage ( 2230 - { 2231 - stdenv, 2232 - pkg-config, 2233 - fetchurl, 2234 - xorgproto, 2235 - testers, 2236 - }: 2237 - stdenv.mkDerivation (finalAttrs: { 2238 - pname = "libXdmcp"; 2239 - version = "1.1.5"; 2240 - builder = ./builder.sh; 2241 - src = fetchurl { 2242 - url = "mirror://xorg/individual/lib/libXdmcp-1.1.5.tar.xz"; 2243 - sha256 = "1312l8x3asib77wgf123w3nbabnky61mb6pnmmqapbf350l259fq"; 2244 - }; 2245 - hardeningDisable = [ 2246 - "bindnow" 2247 - "relro" 2248 - ]; 2249 - strictDeps = true; 2250 - nativeBuildInputs = [ pkg-config ]; 2251 - buildInputs = [ xorgproto ]; 2252 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2253 - meta = { 2254 - pkgConfigModules = [ "xdmcp" ]; 2255 platforms = lib.platforms.unix; 2256 }; 2257 })
··· 9 libpciaccess, 10 libpthread-stubs, 11 libxcvt, 12 + libxdmcp, 13 lndir, 14 luit, 15 makedepend, ··· 46 fontalias = font-alias; 47 fontutil = font-util; 48 libpthreadstubs = libpthread-stubs; 49 + libXdmcp = libxdmcp; 50 utilmacros = util-macros; 51 xcbproto = xcb-proto; 52 xkeyboardconfig = xkeyboard-config; ··· 2222 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2223 meta = { 2224 pkgConfigModules = [ "xdamage" ]; 2225 platforms = lib.platforms.unix; 2226 }; 2227 })
+3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 41 $pcMap{"pthread-stubs"} = "libpthreadstubs"; 42 $pcMap{"xbitmaps"} = "xbitmaps"; 43 $pcMap{"xcb-proto"} = "xcbproto"; 44 $pcMap{"xtrans"} = "xtrans"; 45 $pcMap{"\$PIXMAN"} = "pixman"; 46 $pcMap{"\$RENDERPROTO"} = "xorgproto"; ··· 283 libpciaccess, 284 libpthread-stubs, 285 libxcvt, 286 lndir, 287 luit, 288 makedepend, ··· 319 fontalias = font-alias; 320 fontutil = font-util; 321 libpthreadstubs = libpthread-stubs; 322 utilmacros = util-macros; 323 xcbproto = xcb-proto; 324 xkeyboardconfig = xkeyboard-config;
··· 41 $pcMap{"pthread-stubs"} = "libpthreadstubs"; 42 $pcMap{"xbitmaps"} = "xbitmaps"; 43 $pcMap{"xcb-proto"} = "xcbproto"; 44 + $pcMap{"xdmcp"} = "libXdmcp"; 45 $pcMap{"xtrans"} = "xtrans"; 46 $pcMap{"\$PIXMAN"} = "pixman"; 47 $pcMap{"\$RENDERPROTO"} = "xorgproto"; ··· 284 libpciaccess, 285 libpthread-stubs, 286 libxcvt, 287 + libxdmcp, 288 lndir, 289 luit, 290 makedepend, ··· 321 fontalias = font-alias; 322 fontutil = font-util; 323 libpthreadstubs = libpthread-stubs; 324 + libXdmcp = libxdmcp; 325 utilmacros = util-macros; 326 xcbproto = xcb-proto; 327 xkeyboardconfig = xkeyboard-config;
-11
pkgs/servers/x11/xorg/overrides.nix
··· 243 propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.xorgproto ]; 244 }); 245 246 - libXdmcp = super.libXdmcp.overrideAttrs (attrs: { 247 - outputs = [ 248 - "out" 249 - "dev" 250 - "doc" 251 - ]; 252 - meta = attrs.meta // { 253 - pkgConfigModules = [ "xdmcp" ]; 254 - }; 255 - }); 256 - 257 libXtst = super.libXtst.overrideAttrs (attrs: { 258 meta = attrs.meta // { 259 pkgConfigModules = [ "xtst" ];
··· 243 propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.xorgproto ]; 244 }); 245 246 libXtst = super.libXtst.overrideAttrs (attrs: { 247 meta = attrs.meta // { 248 pkgConfigModules = [ "xtst" ];
-1
pkgs/servers/x11/xorg/tarballs.list
··· 168 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz 169 mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz 170 mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz 171 - mirror://xorg/individual/lib/libXdmcp-1.1.5.tar.xz 172 mirror://xorg/individual/lib/libXext-1.3.6.tar.xz 173 mirror://xorg/individual/lib/libXfixes-6.0.1.tar.xz 174 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
··· 168 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz 169 mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz 170 mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz 171 mirror://xorg/individual/lib/libXext-1.3.6.tar.xz 172 mirror://xorg/individual/lib/libXfixes-6.0.1.tar.xz 173 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2