From 413f94911546b19aa961799fe7dd823b0ca28ea0 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 23 Aug 2025 04:30:51 +0200 Subject: [PATCH 1/4] xset: refactor and move to pkgs/by-name from xorg namespace this removes the dependency on libxxf86misc as it doesn't seem to be needed according to nix-check-deps; also builds fine without --- pkgs/by-name/xs/xset/package.nix | 51 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 44 +--------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 1 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 55 insertions(+), 44 deletions(-) create mode 100644 pkgs/by-name/xs/xset/package.nix diff --git a/pkgs/by-name/xs/xset/package.nix b/pkgs/by-name/xs/xset/package.nix new file mode 100644 index 000000000000..e16e5c884dbf --- /dev/null +++ b/pkgs/by-name/xs/xset/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + libxext, + libxmu, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xset"; + version = "1.2.5"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xset-${finalAttrs.version}.tar.xz"; + hash = "sha256-n2ktVWNbOGLNY2M7EiKodoDsKDx6jo7W3WmKMUf3Xi8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libx11 + libxext + libxmu + ]; + + 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 = "User preference utility for X servers"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xset"; + license = lib.licenses.mitOpenGroup; + mainProgram = "xset"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c03863a205d9..27a80bd9277b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -82,6 +82,7 @@ xprop, xrandr, xrefresh, + xset, xtrans, xvinfo, xwininfo, @@ -126,6 +127,7 @@ self: with self; { xprop xrandr xrefresh + xset xtrans xvinfo xwininfo @@ -5432,48 +5434,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xset = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libXext, - libXmu, - xorgproto, - libXxf86misc, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xset"; - version = "1.2.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xset-1.2.5.tar.xz"; - sha256 = "0bsyyx3k32k9vpb8x3ks7hlfr03nm0i14fv3cg6n4f2vcdajsscz"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - libXext - libXmu - xorgproto - libXxf86misc - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xsetroot = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9975b4053e15..32ebab2453fb 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -398,6 +398,7 @@ print OUT < Date: Sat, 23 Aug 2025 04:42:56 +0200 Subject: [PATCH 2/4] xsetroot: refactor and move to pkgs/by-name from xorg namespace --- pkgs/by-name/xs/xsetroot/package.nix | 53 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 44 +-------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 1 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 57 insertions(+), 44 deletions(-) create mode 100644 pkgs/by-name/xs/xsetroot/package.nix diff --git a/pkgs/by-name/xs/xsetroot/package.nix b/pkgs/by-name/xs/xsetroot/package.nix new file mode 100644 index 000000000000..db3bdc81b024 --- /dev/null +++ b/pkgs/by-name/xs/xsetroot/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + xbitmaps, + libx11, + libxcursor, + libxmu, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xsetroot"; + version = "1.1.3"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xsetroot-${finalAttrs.version}.tar.xz"; + hash = "sha256-YIG0Wp60Qm4EXSWdHhRLMkF/tjXluWqpBkc2WslmONE="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + xbitmaps + libx11 + libxcursor + libxmu + ]; + + 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 = "Root window parameter setting utility for X"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xsetroot"; + license = lib.licenses.mitOpenGroup; + mainProgram = "xsetroot"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 27a80bd9277b..3c5c7bd9db34 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -83,6 +83,7 @@ xrandr, xrefresh, xset, + xsetroot, xtrans, xvinfo, xwininfo, @@ -128,6 +129,7 @@ self: with self; { xrandr xrefresh xset + xsetroot xtrans xvinfo xwininfo @@ -5434,48 +5436,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xsetroot = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - xbitmaps, - libXcursor, - libXmu, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xsetroot"; - version = "1.1.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xsetroot-1.1.3.tar.xz"; - sha256 = "1l9qcv4mldj70slnmfg56nv7yh9j9ca1x795bl26whmlkrdb90b0"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - xbitmaps - libXcursor - libXmu - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xsm = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 32ebab2453fb..7c9f3bb3c524 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -399,6 +399,7 @@ print OUT < Date: Sat, 23 Aug 2025 05:09:56 +0200 Subject: [PATCH 3/4] xsm: refactor and move to pkgs/by-name from xorg namespace also add run time dependencies from the xsm README with makeWrapper --- pkgs/by-name/xs/xsm/package.nix | 88 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 50 +---------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 1 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 92 insertions(+), 50 deletions(-) create mode 100644 pkgs/by-name/xs/xsm/package.nix diff --git a/pkgs/by-name/xs/xsm/package.nix b/pkgs/by-name/xs/xsm/package.nix new file mode 100644 index 000000000000..a8bc165c4991 --- /dev/null +++ b/pkgs/by-name/xs/xsm/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + wrapWithXFileSearchPathHook, + xorgproto, + libice, + libsm, + libx11, + libxaw, + libxt, + makeBinaryWrapper, + writeScript, + # run time dependencies + iceauth, + smproxy, + twm, + xterm, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xsm"; + version = "1.0.6"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xsm-${finalAttrs.version}.tar.xz"; + hash = "sha256-t0zHdMYGDDdZL2ipDb0xsPKmL7FOVidpQ095vihKY84="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + wrapWithXFileSearchPathHook + makeBinaryWrapper + ]; + + buildInputs = [ + xorgproto + libice + libsm + libx11 + libxaw + libxt + ]; + + installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ]; + + postInstall = '' + wrapProgram $out/bin/xsm \ + --prefix PATH : ${ + lib.makeBinPath [ + iceauth + smproxy + twm + xterm + ] + } + ''; + + 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 Session Manager"; + longDescription = '' + A session is a group of X applications, each of which has a particular state. xsm allows you + to create arbitrary sessions - for example, you might have a "light" session, a "development" + session, or an "xterminal" session. Each session can have its own set of applications. Within + a session, you can perform a "checkpoint" to save application state, or a "shutdown" to save + state and exit the session. When you log back in to the system, you can load a specific + session, and you can delete sessions you no longer want to keep. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xsm"; + license = lib.licenses.mitOpenGroup; + mainProgram = "xsm"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 3c5c7bd9db34..54f068823f2f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -84,6 +84,7 @@ xrefresh, xset, xsetroot, + xsm, xtrans, xvinfo, xwininfo, @@ -130,6 +131,7 @@ self: with self; { xrefresh xset xsetroot + xsm xtrans xvinfo xwininfo @@ -5436,54 +5438,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xsm = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libICE, - libSM, - libX11, - libXaw, - xorgproto, - libXt, - wrapWithXFileSearchPathHook, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xsm"; - version = "1.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xsm-1.0.6.tar.xz"; - sha256 = "1kk398lbwyag8dljfmjfn4psdwmh66yhvab85xckf306qrscfk5p"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - wrapWithXFileSearchPathHook - ]; - buildInputs = [ - libICE - libSM - libX11 - libXaw - xorgproto - libXt - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xstdcmap = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 7c9f3bb3c524..6a582098d527 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -400,6 +400,7 @@ print OUT < Date: Sat, 23 Aug 2025 05:19:33 +0200 Subject: [PATCH 4/4] xstdcmap: refactor and move to pkgs/by-name from xorg namespace --- pkgs/by-name/xs/xstdcmap/package.nix | 55 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 1 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 59 insertions(+), 40 deletions(-) create mode 100644 pkgs/by-name/xs/xstdcmap/package.nix diff --git a/pkgs/by-name/xs/xstdcmap/package.nix b/pkgs/by-name/xs/xstdcmap/package.nix new file mode 100644 index 000000000000..e47334435472 --- /dev/null +++ b/pkgs/by-name/xs/xstdcmap/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + libxmu, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xstdcmap"; + version = "1.0.5"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xstdcmap-${finalAttrs.version}.tar.xz"; + hash = "sha256-NlhH43k5hJnsmtmimcxHoNbn/rqVRt/U5bQiIEtawYA="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libx11 + libxmu + ]; + + 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 standard colormap utility"; + longDescription = '' + The xstdcmap utility can be used to selectively define standard colormap properties. + It is intended to be run from a user's X startup script to create standard colormap + definitions in order to facilitate sharing of scarce colormap resources among clients using + PseudoColor visuals. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xstdcmap"; + license = lib.licenses.mitOpenGroup; + mainProgram = "xstdcmap"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 54f068823f2f..a390b0fea1ae 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -85,6 +85,7 @@ xset, xsetroot, xsm, + xstdcmap, xtrans, xvinfo, xwininfo, @@ -132,6 +133,7 @@ self: with self; { xset xsetroot xsm + xstdcmap xtrans xvinfo xwininfo @@ -5438,44 +5440,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xstdcmap = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libXmu, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xstdcmap"; - version = "1.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz"; - sha256 = "1061b95j08mlwpadyilmpbzfgmm08z69k8nrkbn9k11rg7ilfn1n"; - }; - 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 6a582098d527..81778df0f65b 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -401,6 +401,7 @@ print OUT <