diff --git a/pkgs/by-name/xc/xcursor-themes/package.nix b/pkgs/by-name/xc/xcursor-themes/package.nix new file mode 100644 index 000000000000..628d9b71baf6 --- /dev/null +++ b/pkgs/by-name/xc/xcursor-themes/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xcursorgen, + xorgproto, + libxcursor, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xcursor-themes"; + version = "1.0.7"; + + src = fetchurl { + url = "mirror://xorg/individual/data/xcursor-themes-${finalAttrs.version}.tar.xz"; + hash = "sha256-lbro9Igj2JSgW/Qt+/RTZ0q3296xHivAeehSWtRzeMg="; + }; + + strictDeps = true; + nativeBuildInputs = [ + pkg-config + xcursorgen + ]; + buildInputs = [ + xorgproto + libxcursor + ]; + + configureFlags = [ "--with-cursordir=$(out)/share/icons" ]; + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/data/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Default set of cursor themes for use with libXcursor."; + homepage = "https://gitlab.freedesktop.org/xorg/data/cursors"; + license = lib.licenses.x11; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xc/xcursorgen/package.nix b/pkgs/by-name/xc/xcursorgen/package.nix new file mode 100644 index 000000000000..19f65724d1bf --- /dev/null +++ b/pkgs/by-name/xc/xcursorgen/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libpng, + libx11, + libxcursor, + xorgproto, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xcursorgen"; + version = "1.0.9"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xcursorgen-${finalAttrs.version}.tar.xz"; + hash = "sha256-DMnhVqyEyhbqkCcQrzXg+v+lHRN5cHHjtLbMfL1JO7w="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libpng + libx11 + libxcursor + xorgproto + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "prepares X11 cursor sets for use with libXcursor"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xcursorgen"; + license = lib.licenses.hpndSellVariant; + mainProgram = "xcursorgen"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xe/xev/package.nix b/pkgs/by-name/xe/xev/package.nix new file mode 100644 index 000000000000..06c7bd4b6d15 --- /dev/null +++ b/pkgs/by-name/xe/xev/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + libxrandr, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xev"; + version = "1.2.6"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xev-${finalAttrs.version}.tar.xz"; + hash = "sha256-YeHF4AismXOsp83d826d90EOdwg7Aw6wT03HN8UYB9c="; + }; + + strictDeps = true; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + xorgproto + libx11 + libxrandr + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "X event monitor"; + longDescription = '' + xev creates a window and then asks the X server to send it X11 events whenever anything + happens to the window (such as it being moved, resized, typed in, clicked in, etc.). + You can also attach it to an existing window. It is useful for seeing what causes events to + occur and to display the information that they contain; it is essentially a debugging and + development tool, and should not be needed in normal usage. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xev"; + license = lib.licenses.x11; + mainProgram = "xev"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xf/xfsinfo/package.nix b/pkgs/by-name/xf/xfsinfo/package.nix new file mode 100644 index 000000000000..96fe75b0da7e --- /dev/null +++ b/pkgs/by-name/xf/xfsinfo/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libfs, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xfsinfo"; + version = "1.0.8"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xfsinfo-${finalAttrs.version}.tar.xz"; + hash = "sha256-roBZK2Bj2pKOPQyBAjcJsvopoE/NpJ9sNjrFedl/I6I="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libfs + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "X font server information utility"; + longDescription = '' + xfsinfo is a utility for displaying information about an X font server. + It is used to examine the capabilities of a server, the predefined values for various + parameters used in communicating between clients and the server, and the font catalogues and + alternate servers that are available. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xfsinfo"; + license = with lib.licenses; [ + mitOpenGroup + hpndSellVariant + ]; + mainProgram = "xfsinfo"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xr/xrandr/package.nix b/pkgs/by-name/xr/xrandr/package.nix new file mode 100644 index 000000000000..11a74880ff8d --- /dev/null +++ b/pkgs/by-name/xr/xrandr/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + libxrandr, + libxrender, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xrandr"; + version = "1.5.3"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xrandr-${finalAttrs.version}.tar.xz"; + hash = "sha256-+N11Zq23QUf6uZZGgLa7re6Hz0Bqf8/1Fxil5pSbhBw="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libx11 + libxrandr + libxrender + ]; + + postInstall = '' + # remove useless xkeystone script + # it is written in a language not packaged in nixpkgs + rm $out/bin/xkeystone + ''; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Command line interface to X11 Resize, Rotate, and Reflect (RandR) extension"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xrandr"; + license = lib.licenses.hpndSellVariant; + mainProgram = "xrandr"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xv/xvinfo/package.nix b/pkgs/by-name/xv/xvinfo/package.nix new file mode 100644 index 000000000000..d9b021699aaa --- /dev/null +++ b/pkgs/by-name/xv/xvinfo/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + libxv, + libxext, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xvinfo"; + version = "1.1.5"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xvinfo-${finalAttrs.version}.tar.xz"; + hash = "sha256-Pt5x7LJtlhTMvGkWcgKF6VosfgxeGbhXDqr3KtfFxAQ="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libx11 + libxv + libxext + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Utility to print out X-Video extension adaptor information"; + longDescription = '' + xvinfo prints out the capabilities of any video adaptors associated with the display that are + accessible through the X-Video extension. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xvinfo"; + license = lib.licenses.x11; + mainProgram = "xvinfo"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2179d496bc91..15acd52e9e48 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -55,7 +55,11 @@ xbitmaps, xcb-proto, xcmsdb, + xcursorgen, + xcursor-themes, xdriinfo, + xev, + xfsinfo, xkeyboard-config, xlsatoms, xlsclients, @@ -66,8 +70,10 @@ xorgproto, xorg-sgml-doctools, xprop, + xrandr, xrefresh, xtrans, + xvinfo, xwininfo, xwud, }: @@ -93,15 +99,20 @@ self: with self; { transset xbitmaps xcmsdb + xcursorgen xdriinfo + xev + xfsinfo xlsatoms xlsclients xlsfonts xmodmap xorgproto xprop + xrandr xrefresh xtrans + xvinfo xwininfo xwud ; @@ -142,6 +153,7 @@ self: with self; { xcbutilrenderutil = libxcb-render-util; xcbutilwm = libxcb-wm; xkeyboardconfig = xkeyboard-config; + xcursorthemes = xcursor-themes; xorgcffiles = xorg-cf-files; xorgdocs = xorg-docs; xorgsgmldoctools = xorg-sgml-doctools; @@ -2864,78 +2876,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xcursorgen = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libpng, - libX11, - libXcursor, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xcursorgen"; - version = "1.0.9"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xcursorgen-1.0.9.tar.xz"; - sha256 = "1g1v96yprk5nnkip2w3r2cfsbzzsw0ssy417j3m1djl4mibf3j8c"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libpng - libX11 - libXcursor - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xcursorthemes = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libXcursor, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xcursor-themes"; - version = "1.0.7"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz"; - sha256 = "1j3qfga5llp8g702n7mivvdvfjk7agsgnbglbfh99n13i3sfiflm"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libXcursor ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xdm = callPackage ( { @@ -3054,44 +2994,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xev = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - xorgproto, - libXrandr, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xev"; - version = "1.2.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xev-1.2.6.tar.xz"; - sha256 = "1mq7332kgisd9yq0w0rv11vhwhgpkmpg7pfdlyn776dc13hcbqb1"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - xorgproto - libXrandr - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xeyes = callPackage ( { @@ -5210,42 +5112,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xfsinfo = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libFS, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xfsinfo"; - version = "1.0.7"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xfsinfo-1.0.7.tar.xz"; - sha256 = "0x48p4hk0lds2s8nwzgfl616r99s28ydx02zs7p1fxxs3i2wmwwj"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libFS - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xgamma = callPackage ( { @@ -5910,46 +5776,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xrandr = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - xorgproto, - libXrandr, - libXrender, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xrandr"; - version = "1.5.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xrandr-1.5.3.tar.xz"; - sha256 = "0744kfafd98q2zswyzva837qgvmdpfv80ilnp7x4fhdpmmk7bpgq"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - xorgproto - libXrandr - libXrender - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xrdb = callPackage ( { @@ -6196,44 +6022,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xvinfo = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - xorgproto, - libXv, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xvinfo"; - version = "1.1.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xvinfo-1.1.5.tar.xz"; - sha256 = "0164qpbjmxxa1rbvh6ay1iz2qnp9hl1745k9pk6195kdnbn73piy"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - xorgproto - libXv - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xwd = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index e7e31a73bb3a..0abd26780af1 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -371,7 +371,11 @@ print OUT <