From cab259b532811a33a26b4686beee4d4f644cf5bb Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sun, 23 Nov 2025 00:10:25 +0100 Subject: [PATCH] editres: 1.0.8 -> 1.0.9 and refactor; xorg.editres: alias to editres relevant changes: - switch to gitlab source --- pkgs/by-name/ed/editres/package.nix | 80 +++++++++++++------ pkgs/servers/x11/xorg/default.nix | 50 +----------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 7 -- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 59 insertions(+), 81 deletions(-) diff --git a/pkgs/by-name/ed/editres/package.nix b/pkgs/by-name/ed/editres/package.nix index 63ec3f9d74d7..e75421201235 100644 --- a/pkgs/by-name/ed/editres/package.nix +++ b/pkgs/by-name/ed/editres/package.nix @@ -1,40 +1,70 @@ { lib, stdenv, - fetchurl, + fetchFromGitLab, pkg-config, - libXt, - libXaw, - libXres, - utilmacros, + util-macros, + autoreconfHook, + wrapWithXFileSearchPathHook, + libx11, + libxaw, + libxkbfile, + libxmu, + libxres, + libxt, + xorgproto, + nix-update-script, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "editres"; - version = "1.0.8"; + version = "1.0.9"; - src = fetchurl { - url = "mirror://xorg/individual/app/editres-${version}.tar.gz"; - sha256 = "sha256-LVbWB3vHZ6+n4DD+ssNy/mvok/7EApoj9FodVZ/YRq4="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "app"; + repo = "editres"; + tag = "editres-${finalAttrs.version}"; + hash = "sha256-fdp6j8zS8mtzHpG9js9c8iIt1vsKsqGG9MdkpLh8UB0="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libXt - libXaw - libXres - utilmacros - ]; - - configureFlags = [ "--with-appdefaultdir=$(out)/share/X11/app-defaults/editres" ]; + strictDeps = true; hardeningDisable = [ "format" ]; - meta = with lib; { - homepage = "https://cgit.freedesktop.org/xorg/app/editres/"; + nativeBuildInputs = [ + pkg-config + util-macros + autoreconfHook + wrapWithXFileSearchPathHook + ]; + + buildInputs = [ + libx11 + libxaw + libxkbfile + libxmu + libxres + libxt + xorgproto + ]; + + installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=editres-(.*)" ]; }; + + meta = { description = "Dynamic resource editor for X Toolkit applications"; - license = licenses.mit; - platforms = platforms.linux; + longDescription = '' + Editres is a tool that allows users and application developers to view the full widget + hierarchy of any Xt Toolkit application that speaks the Editres protocol. In addition, editres + will help the user construct resource specifications, allow the user to apply the resource + to the application and view the results dynamically. Once the user is happy with a resource + specification editres will append the resource string to the user's X Resources file. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/editres"; + license = lib.licenses.mitOpenGroup; mainProgram = "editres"; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 97e0a10c28b1..e9259ed1f794 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -4,6 +4,7 @@ appres, bdftopcf, bitmap, + editres, font-adobe-100dpi, font-adobe-75dpi, font-adobe-utopia-100dpi, @@ -157,6 +158,7 @@ self: with self; { appres bdftopcf bitmap + editres gccmakedep ico imake @@ -304,54 +306,6 @@ self: with self; { xorgdocs = xorg-docs; xorgsgmldoctools = xorg-sgml-doctools; - # THIS IS A GENERATED FILE. DO NOT EDIT! - editres = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libxkbfile, - libX11, - libXaw, - libXmu, - xorgproto, - libXt, - wrapWithXFileSearchPathHook, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "editres"; - version = "1.0.9"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/editres-1.0.9.tar.xz"; - sha256 = "1imk7mgdc3q9lf058xisajij374x8r31ynvqmwbs9khfdxx3zz6d"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - wrapWithXFileSearchPathHook - ]; - buildInputs = [ - libxkbfile - libX11 - libXaw - libXmu - xorgproto - libXt - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! fonttosfnt = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 43ec0875cb32..4989131c3bdb 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -335,6 +335,7 @@ print OUT <