From 59a16f2888c449892f2dad2fd230e86768a3f504 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Mon, 9 Jun 2025 02:42:29 +0200 Subject: [PATCH 1/2] xprop: 1.2.7 -> 1.2.8 && refactor and move to pkgs/by-name from xorg namespace --- pkgs/by-name/xp/xprop/package.nix | 51 +++++++++++++++++++ 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, 55 insertions(+), 38 deletions(-) create mode 100644 pkgs/by-name/xp/xprop/package.nix diff --git a/pkgs/by-name/xp/xprop/package.nix b/pkgs/by-name/xp/xprop/package.nix new file mode 100644 index 000000000000..9943a313949d --- /dev/null +++ b/pkgs/by-name/xp/xprop/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libx11, + xorgproto, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xprop"; + version = "1.2.8"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xprop-${finalAttrs.version}.tar.xz"; + hash = "sha256-1onirbfve0OfZGm1HNqKfa78gyQ4VMKjuPhNDwKdZ+4="; + }; + + 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 = "Command line tool to display and/or set window and font properties of an X server"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xprop"; + license = with lib.licenses; [ + mitOpenGroup + hpndSellVariant + mit + ]; + mainProgram = "xprop"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index dab99654eb6e..8cf2c96c4f9d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -27,6 +27,7 @@ xorg-docs, xorgproto, xorg-sgml-doctools, + xprop, xtrans, }: @@ -46,6 +47,7 @@ self: with self; { sessreg xbitmaps xorgproto + xprop xtrans ; fontalias = font-alias; @@ -7304,42 +7306,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xprop = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xprop"; - version = "1.2.8"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xprop-1.2.8.tar.xz"; - sha256 = "1vk7kl10ykgqp2iw4m1q4j1zrbkxibd1rdb9cjgl6yzgnyny52fn"; - }; - 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; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xrandr = 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..0ed222f48fb8 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -312,6 +312,7 @@ print OUT < Date: Mon, 9 Jun 2025 03:12:37 +0200 Subject: [PATCH 2/2] xrefresh: refactor and migrate to pkgs/by-name from xorg namespace --- pkgs/by-name/xr/xrefresh/package.nix | 50 +++++++++++++++++++ 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, 54 insertions(+), 38 deletions(-) create mode 100644 pkgs/by-name/xr/xrefresh/package.nix diff --git a/pkgs/by-name/xr/xrefresh/package.nix b/pkgs/by-name/xr/xrefresh/package.nix new file mode 100644 index 000000000000..11866c2ce5c8 --- /dev/null +++ b/pkgs/by-name/xr/xrefresh/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libx11, + xorgproto, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xrefresh"; + version = "1.1.0"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xrefresh-${finalAttrs.version}.tar.xz"; + hash = "sha256-Ke1ZLV7ONaMCkATYxG8wAvkpcIcKlsEeOLr38RIri18="; + }; + + 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 refresh all or part of an X screen"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xrefresh"; + license = with lib.licenses; [ + mitOpenGroup + hpnd + ]; + mainProgram = "xrefresh"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 8cf2c96c4f9d..4b139143994b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -28,6 +28,7 @@ xorgproto, xorg-sgml-doctools, xprop, + xrefresh, xtrans, }: @@ -48,6 +49,7 @@ self: with self; { xbitmaps xorgproto xprop + xrefresh xtrans ; fontalias = font-alias; @@ -7384,42 +7386,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xrefresh = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xrefresh"; - version = "1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xrefresh-1.1.0.tar.xz"; - sha256 = "0pwb5c9g3xxs70gc35hahxq2ky8261pw9n04j01a6dffbqnmkv99"; - }; - 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; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xset = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 0ed222f48fb8..df8abadb0d4a 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 <