libxtst: refactor, move to pkgs/by-name and rename from xorg.libXtst (19d5fe04) · Commits · nix / nixpkgs

pkgs/by-name/li/libxtst/package.nix

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		{
		lib,
		stdenv,
		fetchurl,
		pkg-config,
		xorgproto,
		libx11,
		libxext,
		libxi,
		writeScript,
		testers,
		}:
		stdenv.mkDerivation (finalAttrs: {
		pname = "libxtst";
		version = "1.2.5";

		src = fetchurl {
		url = "mirror://xorg/individual/lib/libXtst-${finalAttrs.version}.tar.xz";
		hash = "sha256-tQ1MJblwCadEcGwQOcWY9NjmSRDJ/eOBmU4criNdkkI=";
		};

		strictDeps = true;

		nativeBuildInputs = [ pkg-config ];

		buildInputs = [
		xorgproto
		libx11
		libxext
		libxi
		];

		passthru = {
		updateScript = writeScript "update-${finalAttrs.pname}" ''
		#!/usr/bin/env nix-shell
		#!nix-shell -i bash -p common-updater-scripts
		version="$(list-directory-versions --pname libXtst \
		--url https://xorg.freedesktop.org/releases/individual/lib/ \
		\| sort -V \| tail -n1)"
		update-source-version ${finalAttrs.pname} "$version"
		'';
		tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
		};

		meta = {
		description = "Library for the XTEST and RECORD X11 extensions";
		longDescription = ''
		The XTEST extension is a minimal set of client and server extensions required to completely
		test the X11 server with no user intervention. This extension is not intended to support
		general journaling and playback of user actions.
		The RECORD extension supports the recording and reporting of all core X protocol and arbitrary
		X extension protocol.
		'';
		homepage = "https://gitlab.freedesktop.org/xorg/lib/libxtst";
		license = with lib.licenses; [
		mitOpenGroup
		hpndSellVariant
		hpndDoc
		x11
		hpndDocSell
		];
		maintainers = [ ];
		pkgConfigModules = [ "xtst" ];
		platforms = lib.platforms.unix;
		};
		})

pkgs/servers/x11/xorg/default.nix

+2 −40

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@
		libxscrnsaver,
		libxshmfence,
		libxt,
		libxtst,
		libxv,
		libxvmc,
		libxxf86dga,
		@@ -249,6 +250,7 @@ self: with self; {
		libXres = libxres;
		libXScrnSaver = libxscrnsaver;
		libXt = libxt;
		libXtst = libxtst;
		libXv = libxv;
		libXvMC = libxvmc;
		libXxf86dga = libxxf86dga;
		@@ -953,46 +955,6 @@ self: with self; {
		})
		) { };

		# THIS IS A GENERATED FILE. DO NOT EDIT!
		libXtst = callPackage (
		{
		stdenv,
		pkg-config,
		fetchurl,
		xorgproto,
		libX11,
		libXext,
		libXi,
		testers,
		}:
		stdenv.mkDerivation (finalAttrs: {
		pname = "libXtst";
		version = "1.2.5";
		builder = ./builder.sh;
		src = fetchurl {
		url = "mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz";
		sha256 = "0hljblisw72fk60y7zf9214ydn7lk32kj43cf12af2bhp4jlq3dm";
		};
		hardeningDisable = [
		"bindnow"
		"relro"
		];
		strictDeps = true;
		nativeBuildInputs = [ pkg-config ];
		buildInputs = [
		xorgproto
		libX11
		libXext
		libXi
		];
		passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
		meta = {
		pkgConfigModules = [ "xtst" ];
		platforms = lib.platforms.unix;
		};
		})
		) { };

		# THIS IS A GENERATED FILE. DO NOT EDIT!
		oclock = callPackage (
		{

pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl

+3 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,7 @@ $pcMap{"xscrnsaver"} = "libXScrnSaver";
		$pcMap{"xshmfence"} = "libxshmfence";
		$pcMap{"xt"} = "libXt";
		$pcMap{"xtrans"} = "xtrans";
		$pcMap{"xtst"} = "libXtst";
		$pcMap{"xv"} = "libXv";
		$pcMap{"xvmc"} = "libXvMC";
		$pcMap{"xvmc-wrapper"} = "libXvMC";
		@@ -405,6 +406,7 @@ print OUT <<EOF;
		libxscrnsaver,
		libxshmfence,
		libxt,
		libxtst,
		libxv,
		libxvmc,
		libxxf86dga,
		@@ -579,6 +581,7 @@ self: with self; {
		libXres = libxres;
		libXScrnSaver = libxscrnsaver;
		libXt = libxt;
		libXtst = libxtst;
		libXv = libxv;
		libXvMC = libxvmc;
		libXxf86dga = libxxf86dga;

pkgs/servers/x11/xorg/overrides.nix

+0 −6

Original line number	Diff line number	Diff line
		@@ -140,12 +140,6 @@ self: super:

		mkfontdir = xorg.mkfontscale;

		libXtst = super.libXtst.overrideAttrs (attrs: {
		meta = attrs.meta // {
		pkgConfigModules = [ "xtst" ];
		};
		});

		xdpyinfo = super.xdpyinfo.overrideAttrs (attrs: {
		configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
		preConfigure =

pkgs/servers/x11/xorg/tarballs.list

+0 −1

Original line number	Diff line number	Diff line
		@@ -85,5 +85,4 @@ mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz
		mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
		mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
		mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
		mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz
		mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz

Admin message