From 47584421cd9a53030d02cf224b5700177ba60548 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 4 Jul 2026 00:35:28 -0400 Subject: [PATCH 1/3] xclock: 1.1.1 -> 1.2.0 Diff: https://gitlab.freedesktop.org/xorg/app/xclock/-/compare/xclock-1.1.1...xclock-1.2.0 Among other changes, it fixes darwin with this patch: https://gitlab.freedesktop.org/xorg/app/xclock/-/commit/fd4b44ea3b122cb15181242c4aa9ffc6b2674ca7 --- pkgs/by-name/xc/xclock/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/xc/xclock/package.nix b/pkgs/by-name/xc/xclock/package.nix index ed01c2ba7cf6..cf6ec840de32 100644 --- a/pkgs/by-name/xc/xclock/package.nix +++ b/pkgs/by-name/xc/xclock/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitLab, - fetchpatch, meson, ninja, pkg-config, @@ -19,7 +18,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xclock"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -27,17 +26,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "app"; repo = "xclock"; tag = "xclock-${finalAttrs.version}"; - hash = "sha256-ZgUb+iVO45Az/C+2YJ1TXxcTLk3zQjM1GGv2E69WNfo="; + hash = "sha256-sytAl9vXBdxjTM0NnAgRNK34yqn/6zJeCQ/9bH3xaOc="; }; - patches = [ - # meson build system patch - (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/app/xclock/-/commit/28e10bd26ac7e02fe8a4fb8016bb115f8d664032.patch"; - hash = "sha256-KdrS7VneJqwVPB+TRJoMmtR03Ju3PvvUMYfXz5tII6k="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ From 5b1f2ce84a8d3bc846be011ebb89d2cdbf858948 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 4 Jul 2026 01:17:22 -0400 Subject: [PATCH 2/3] xclock: add version check --- pkgs/by-name/xc/xclock/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/xc/xclock/package.nix b/pkgs/by-name/xc/xclock/package.nix index cf6ec840de32..a6f15830cdb6 100644 --- a/pkgs/by-name/xc/xclock/package.nix +++ b/pkgs/by-name/xc/xclock/package.nix @@ -5,6 +5,7 @@ meson, ninja, pkg-config, + versionCheckHook, wrapWithXFileSearchPathHook, libx11, libxaw, @@ -53,6 +54,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "appdefaultdir" "${placeholder "out"}/share/X11/app-defaults") ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "-version"; + doInstallCheck = true; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xclock-(.*)" ]; }; meta = { From 186834db39ea905e5ff7a0bbad96ff2031a34174 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 4 Jul 2026 01:17:52 -0400 Subject: [PATCH 3/3] xclock: add booxter as maintainer --- pkgs/by-name/xc/xclock/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/xc/xclock/package.nix b/pkgs/by-name/xc/xclock/package.nix index a6f15830cdb6..965ed0f2d398 100644 --- a/pkgs/by-name/xc/xclock/package.nix +++ b/pkgs/by-name/xc/xclock/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { mit ]; mainProgram = "xclock"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ booxter ]; platforms = lib.platforms.unix; }; })