From 2f91c6aa23df10a90ea37995863e9c86d229856b Mon Sep 17 00:00:00 2001 From: Zitrone Date: Mon, 9 Jun 2025 03:41:27 +0200 Subject: [PATCH 1/2] xwininfo: refactor and migrate to pkgs/by-name from xorg namespace --- pkgs/by-name/xw/xwininfo/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/xw/xwininfo/package.nix diff --git a/pkgs/by-name/xw/xwininfo/package.nix b/pkgs/by-name/xw/xwininfo/package.nix new file mode 100644 index 000000000000..f34aee5c7b17 --- /dev/null +++ b/pkgs/by-name/xw/xwininfo/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libx11, + libxcb, + xorgproto, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xwininfo"; + version = "1.1.6"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xwininfo-${finalAttrs.version}.tar.xz"; + hash = "sha256-NRiJfBdEjfm6ma1tm7HKDxe8DtfA/WEoGzTO7SmpJT8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libx11 + libxcb + 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 = "Utility to print information about windows on an X server"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xwininfo"; + license = with lib.licenses; [ + mit + # mit-open-group with icu disclaimer ?! + # close enough to mit-open-group + mitOpenGroup + hpndSellVariant + ]; + mainProgram = "xwininfo"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index dab99654eb6e..156feb26f737 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -28,6 +28,7 @@ xorgproto, xorg-sgml-doctools, xtrans, + xwininfo, }: self: with self; { @@ -47,6 +48,7 @@ self: with self; { xbitmaps xorgproto xtrans + xwininfo ; fontalias = font-alias; fontutil = font-util; @@ -7738,44 +7740,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xwininfo = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libxcb, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xwininfo"; - version = "1.1.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xwininfo-1.1.6.tar.xz"; - sha256 = "0gr5m4lyvkil3cl63zf0sw7bq5qgraqrnvddk6xgk3a42xy8j61m"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - libxcb - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xwud = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 2515d4bd7e24..d7e0297c320a 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -313,6 +313,7 @@ print OUT < Date: Mon, 9 Jun 2025 03:49:26 +0200 Subject: [PATCH 2/2] xwud: refactor and move to pkgs/by-name from xorg namespace --- pkgs/by-name/xw/xwud/package.nix | 47 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 38 +-------------- .../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, 51 insertions(+), 38 deletions(-) create mode 100644 pkgs/by-name/xw/xwud/package.nix diff --git a/pkgs/by-name/xw/xwud/package.nix b/pkgs/by-name/xw/xwud/package.nix new file mode 100644 index 000000000000..c7bf3f5cdd63 --- /dev/null +++ b/pkgs/by-name/xw/xwud/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libx11, + xorgproto, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xwud"; + version = "1.0.7"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xwud-${finalAttrs.version}.tar.xz"; + hash = "sha256-5Vy+2rNtel9nGr+OWUiIr8SMqhFtUdQp6lPqMX7Axh4="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libx11 + 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 = "Utility to display an image in XWD (X Window Dump) format"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xwud"; + license = lib.licenses.mitOpenGroup; + mainProgram = "xwud"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 156feb26f737..f553ed6ce866 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -29,6 +29,7 @@ xorg-sgml-doctools, xtrans, xwininfo, + xwud, }: self: with self; { @@ -49,6 +50,7 @@ self: with self; { xorgproto xtrans xwininfo + xwud ; fontalias = font-alias; fontutil = font-util; @@ -7740,40 +7742,4 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xwud = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xwud"; - version = "1.0.7"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xwud-1.0.7.tar.xz"; - sha256 = "07n6q1z33sjkx8lx8lbd26m8ri5gi145k3mz39kmyykdngdbwp75"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - } diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index d7e0297c320a..88628c31ac74 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -314,6 +314,7 @@ print OUT <