diff --git a/pkgs/by-name/xk/xkbevd/package.nix b/pkgs/by-name/xk/xkbevd/package.nix new file mode 100644 index 000000000000..fa479d469a22 --- /dev/null +++ b/pkgs/by-name/xk/xkbevd/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + bison, + pkg-config, + util-macros, + libx11, + libxkbfile, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xkbevd"; + version = "1.1.6"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "app"; + repo = "xkbevd"; + tag = "xkbevd-${finalAttrs.version}"; + hash = "sha256-n/detXvtRvysc5pjFc0Q27yLC2QsNUBo9AIXYkUG4PQ="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + bison + pkg-config + util-macros + ]; + + buildInputs = [ + util-macros # unused dependency but the build fails if pkg-config can't find it + libx11 + libxkbfile + ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xkbevd-(.*)" ]; }; + + meta = { + description = "XKB event daemon"; + longDescription = '' + The xkbevd event daemon listens for specified XKB events and executes requested commands if + they occur. The configuration file consists of a list of event specification/action pairs + and/or variable definitions. + This command is very raw and is therefore only partially implemented; it is a rough prototype + for developers, not a general purpose tool for end users. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xkbevd"; + license = lib.licenses.hpnd; + mainProgram = "xkbevd"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xk/xkbprint/package.nix b/pkgs/by-name/xk/xkbprint/package.nix new file mode 100644 index 000000000000..831e8e04306b --- /dev/null +++ b/pkgs/by-name/xk/xkbprint/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + libx11, + libxkbfile, + xorgproto, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xkbprint"; + version = "1.0.7"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "app"; + repo = "xkbprint"; + tag = "xkbprint-${finalAttrs.version}"; + hash = "sha256-JcVXwhEV6tTdgBNki7MuUPjjZOjVE83uBP/yc+ShycE="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + ]; + + buildInputs = [ + libx11 + libxkbfile + xorgproto + ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xkbprint-(.*)" ]; }; + + meta = { + description = "Generates a PostScript image of an XKB keyboard description."; + homepage = "https://gitlab.freedesktop.org/xorg/app/xkbprint"; + license = with lib.licenses; [ + hpnd + hpndDec + ]; + mainProgram = "xkbprint"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xl/xload/package.nix b/pkgs/by-name/xl/xload/package.nix new file mode 100644 index 000000000000..f57b1f5bef3d --- /dev/null +++ b/pkgs/by-name/xl/xload/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + wrapWithXFileSearchPathHook, + libx11, + libxaw, + libxmu, + xorgproto, + libxt, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xload"; + version = "1.2.0"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "app"; + repo = "xload"; + tag = "xload-${finalAttrs.version}"; + hash = "sha256-Mm09uKP+LUW0xGrwcJth/XCUqJ1RDEspbYpL92vOdk4="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + wrapWithXFileSearchPathHook + ]; + + buildInputs = [ + libx11 + libxaw + libxmu + xorgproto + libxt + ]; + + installFlags = [ "appdefaultdir=$out/share/X11/app-defaults" ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xload-(.*)" ]; }; + + meta = { + description = "System load average display for X"; + longDescription = '' + xload displays a periodically updating histogram of the system load average. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xload"; + license = with lib.licenses; [ + x11 + mit + ]; + mainProgram = "xload"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xp/xpr/package.nix b/pkgs/by-name/xp/xpr/package.nix new file mode 100644 index 000000000000..8a63eb0ebd0c --- /dev/null +++ b/pkgs/by-name/xp/xpr/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + xorgproto, + libx11, + libxmu, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xpr"; + version = "1.2.0"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "app"; + repo = "xpr"; + tag = "xpr-${finalAttrs.version}"; + hash = "sha256-q8WcQSzlAwbdIcXWyQjjHmvuqYa4k2e7O+VhShwBDUE="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + ]; + + buildInputs = [ + xorgproto + libx11 + libxmu + ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xpr-(.*)" ]; }; + + meta = { + description = "Utility to print an X window dump from xwd"; + longDescription = '' + xpr takes as input a window dump file produced by xwd and formats it for output on various + types of printers. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xpr"; + license = with lib.licenses; [ + mit + x11 + hpnd + ]; + mainProgram = "xpr"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c4b3f6124381..79141d56bf1e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -134,9 +134,12 @@ xgamma, xgc, xhost, + xkbevd, + xkbprint, xkbutils, xkeyboard-config, xkill, + xload, xlsatoms, xlsclients, xlsfonts, @@ -149,6 +152,7 @@ xorgproto, xorg-server, xorg-sgml-doctools, + xpr, xprop, xrandr, xrdb, @@ -217,8 +221,11 @@ self: with self; { xgamma xgc xhost + xkbevd + xkbprint xkbutils xkill + xload xlsatoms xlsclients xlsfonts @@ -227,6 +234,7 @@ self: with self; { xmodmap xmore xorgproto + xpr xprop xrandr xrdb @@ -2234,166 +2242,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xkbevd = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libxkbfile, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xkbevd"; - version = "1.1.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz"; - sha256 = "0gh73dsf4ic683k9zn2nj9bpff6dmv3gzcb3zx186mpq9kw03d6r"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - libxkbfile - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xkbprint = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libxkbfile, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xkbprint"; - version = "1.0.7"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz"; - sha256 = "1k2rm8lvc2klcdz2s3mymb9a2ahgwqwkgg67v3phv7ij6304jkqw"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - libxkbfile - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xload = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libXaw, - libXmu, - xorgproto, - libXt, - gettext, - wrapWithXFileSearchPathHook, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xload"; - version = "1.2.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xload-1.2.0.tar.xz"; - sha256 = "104snn0rpnc91bmgj797cj6sgmkrp43n9mg20wbmr8p14kbfc3rc"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - gettext - wrapWithXFileSearchPathHook - ]; - buildInputs = [ - libX11 - libXaw - libXmu - xorgproto - libXt - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xpr = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libXmu, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xpr"; - version = "1.2.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xpr-1.2.0.tar.xz"; - sha256 = "1hyf6mc2l7lzkf21d5j4z6glg9y455hlsg8lv2lz028k6gw0554b"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - libXmu - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xtrap = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 87fd10ce233a..9c2c32c17c80 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -466,9 +466,12 @@ print OUT <