From 4cc11e680666d397cd24bf1dd82275e8664ecb57 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Wed, 10 Sep 2025 16:45:40 +0200 Subject: [PATCH 1/4] x11perf: 1.6.1 -> 1.7.0, refactor & move to pkgs/by-name from xorg namespace relevant changes: - fix x11perfcomp containing reference to /bin/cat --- pkgs/by-name/x1/x11perf/package.nix | 64 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 46 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 10 --- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 68 insertions(+), 55 deletions(-) create mode 100644 pkgs/by-name/x1/x11perf/package.nix diff --git a/pkgs/by-name/x1/x11perf/package.nix b/pkgs/by-name/x1/x11perf/package.nix new file mode 100644 index 000000000000..f707af8810e3 --- /dev/null +++ b/pkgs/by-name/x1/x11perf/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + libxext, + libxft, + libxmu, + libxrender, + freetype, + fontconfig, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "x11perf"; + version = "1.7.0"; + + src = fetchurl { + url = "mirror://xorg/individual/test/x11perf-${finalAttrs.version}.tar.xz"; + hash = "sha256-JPgNhLDpYXGpmJMv8Adpj9F3bamXXtQuUdV7nPypGCg="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libx11 + libxext + libxft + libxmu + libxrender + freetype + fontconfig + ]; + + postInstall = '' + substituteInPlace $out/bin/x11perfcomp \ + --replace-fail "/bin/cat" "cat" + ''; + + 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/test/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "X11 server performance test program"; + homepage = "https://gitlab.freedesktop.org/xorg/test/x11perf"; + license = lib.licenses.hpnd; + mainProgram = "x11perf"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 36eeac74ab32..3c62b4ed54ac 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -88,6 +88,7 @@ transset, util-macros, viewres, + x11perf, xauth, xbacklight, xbitmaps, @@ -153,6 +154,7 @@ self: with self; { smproxy transset viewres + x11perf xauth xbacklight xbitmaps @@ -1213,50 +1215,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - x11perf = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libXext, - libXft, - libXmu, - xorgproto, - libXrender, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "x11perf"; - version = "1.6.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2"; - sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - libXext - libXft - libXmu - xorgproto - libXrender - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xcalc = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 958a76b60c98..b3f806abf926 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -415,6 +415,7 @@ print OUT < Date: Sat, 23 Aug 2025 00:20:25 +0200 Subject: [PATCH 2/4] xcalc: refactor and move to pkgs/by-name from xorg namespace --- pkgs/by-name/xc/xcalc/package.nix | 60 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 46 +------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 2 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 64 insertions(+), 47 deletions(-) create mode 100644 pkgs/by-name/xc/xcalc/package.nix diff --git a/pkgs/by-name/xc/xcalc/package.nix b/pkgs/by-name/xc/xcalc/package.nix new file mode 100644 index 000000000000..a784ed745d13 --- /dev/null +++ b/pkgs/by-name/xc/xcalc/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + wrapWithXFileSearchPathHook, + libx11, + libxaw, + libxt, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xcalc"; + version = "1.1.2"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xcalc-${finalAttrs.version}.tar.xz"; + hash = "sha256-hXjfoUV+lCifbW7WFGcUMH2Kc6G1TS9CrxMhtiX8HNQ="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + wrapWithXFileSearchPathHook + ]; + + buildInputs = [ + xorgproto + libx11 + libxaw + libxt + ]; + + installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ]; + + 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 = "Scientific calculator X11 client that can emulate a TI-30 or an HP-10C"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xcalc"; + license = with lib.licenses; [ + x11 + hpndSellVariant + ]; + mainProgram = "xcalc"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 3c62b4ed54ac..c46dffee19f9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -92,6 +92,7 @@ xauth, xbacklight, xbitmaps, + xcalc, xcb-proto, xcmsdb, xconsole, @@ -158,6 +159,7 @@ self: with self; { xauth xbacklight xbitmaps + xcalc xcmsdb xconsole xcursorgen @@ -1215,50 +1217,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xcalc = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libXaw, - xorgproto, - libXt, - wrapWithXFileSearchPathHook, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xcalc"; - version = "1.1.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xcalc-1.1.2.tar.xz"; - sha256 = "1m0wzhjvc88kmx12ykdml5rqlz9h2iki9mkfdngji53y8nhxyy45"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - wrapWithXFileSearchPathHook - ]; - buildInputs = [ - 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! xclock = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index b3f806abf926..ee8280999425 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -419,6 +419,7 @@ print OUT < Date: Wed, 10 Sep 2025 17:27:35 +0200 Subject: [PATCH 3/4] xcompmgr: refactor & move to pkgs/by-name from xorg namespace --- pkgs/by-name/xc/xcompmgr/package.nix | 59 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 46 +-------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 1 - pkgs/servers/x11/xorg/tarballs.list | 1 - pkgs/top-level/all-packages.nix | 2 - 6 files changed, 63 insertions(+), 48 deletions(-) create mode 100644 pkgs/by-name/xc/xcompmgr/package.nix diff --git a/pkgs/by-name/xc/xcompmgr/package.nix b/pkgs/by-name/xc/xcompmgr/package.nix new file mode 100644 index 000000000000..e40cc7b807f3 --- /dev/null +++ b/pkgs/by-name/xc/xcompmgr/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libxcomposite, + libxdamage, + libxext, + libxfixes, + libxrender, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xcompmgr"; + version = "1.1.10"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xcompmgr-${finalAttrs.version}.tar.xz"; + hash = "sha256-eCT3CcTyJDLq6nVC7JM4Tl3Uj2/LhcEv+C1yFCOwuY8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libxcomposite + libxdamage + libxext + libxfixes + libxrender + ]; + + 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 = "Sample X11 compositing manager"; + longDescription = '' + xcompmgr is a sample compositing manager for X servers supporting the XFIXES, DAMAGE, RENDER + and COMPOSITE extensions. It enables basic eye-candy effects. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xcompmgr"; + license = lib.licenses.hpndSellVariant; + mainProgram = "xcompmgr"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c46dffee19f9..9698be43cffa 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -95,6 +95,7 @@ xcalc, xcb-proto, xcmsdb, + xcompmgr, xconsole, xcursorgen, xcursor-themes, @@ -161,6 +162,7 @@ self: with self; { xbitmaps xcalc xcmsdb + xcompmgr xconsole xcursorgen xdriinfo @@ -1269,50 +1271,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xcompmgr = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libXcomposite, - libXdamage, - libXext, - libXfixes, - xorgproto, - libXrender, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xcompmgr"; - version = "1.1.10"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xcompmgr-1.1.10.tar.xz"; - sha256 = "13xrn0ii8widz0pw31fbdy7x8paf729yqhkmxbm3497jqh4zf93q"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libXcomposite - libXdamage - libXext - libXfixes - xorgproto - libXrender - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xdm = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index ee8280999425..30fe7403d84d 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -422,6 +422,7 @@ print OUT < Date: Wed, 10 Sep 2025 17:35:18 +0200 Subject: [PATCH 4/4] xeyes: 1.3.0 -> 1.3.1, refactor & move to pkgs/by-name from xorg namespace --- pkgs/by-name/xe/xeyes/package.nix | 59 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 50 +--------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 2 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 63 insertions(+), 51 deletions(-) create mode 100644 pkgs/by-name/xe/xeyes/package.nix diff --git a/pkgs/by-name/xe/xeyes/package.nix b/pkgs/by-name/xe/xeyes/package.nix new file mode 100644 index 000000000000..b23c50e764ae --- /dev/null +++ b/pkgs/by-name/xe/xeyes/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + libxcb, + libxext, + libxi, + libxmu, + libxrender, + libxt, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xeyes"; + version = "1.3.1"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xeyes-${finalAttrs.version}.tar.xz"; + hash = "sha256-VgjXa3sarF7X8i8ba1rXTvmMhpMiDzK0uH3M7kqVbqo="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libx11 + libxcb + libxext + libxi + libxmu + libxrender + libxt + ]; + + 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 = "A \"follow the mouse\" X demo, using the X SHAPE extension"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xeyes"; + license = lib.licenses.x11; + mainProgram = "xeyes"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9698be43cffa..7b1b67bd6429 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -101,6 +101,7 @@ xcursor-themes, xdriinfo, xev, + xeyes, xfontsel, xfsinfo, xgamma, @@ -167,6 +168,7 @@ self: with self; { xcursorgen xdriinfo xev + xeyes xfontsel xfsinfo xgamma @@ -1389,54 +1391,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xeyes = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libxcb, - libXext, - libXi, - libXmu, - xorgproto, - libXrender, - libXt, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xeyes"; - version = "1.3.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xeyes-1.3.0.tar.xz"; - sha256 = "08rhfp5xlmdbyxkvxhgjxdn6vwzrbrjyd7jkk8b7wi1kpw0ccl09"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - libxcb - libXext - libXi - libXmu - xorgproto - libXrender - libXt - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xf86inputevdev = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 30fe7403d84d..2c5a41fb9da2 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -428,6 +428,7 @@ print OUT <