From db5b5e2bc42acb00ec341e42cfbca9d2865bb78b Mon Sep 17 00:00:00 2001 From: whispers Date: Tue, 14 Apr 2026 14:00:27 -0400 Subject: [PATCH 1/3] xorg-server: 21.1.21 -> 21.1.22 Announcement: https://lists.x.org/archives/xorg-announce/2026-April/003678.html Advisories: https://lists.x.org/archives/xorg-announce/2026-April/003677.html --- pkgs/by-name/xo/xorg-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix index 2afcf03a0137..e1c04838b820 100644 --- a/pkgs/by-name/xo/xorg-server/package.nix +++ b/pkgs/by-name/xo/xorg-server/package.nix @@ -57,7 +57,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; - version = "21.1.21"; + version = "21.1.22"; outputs = [ "out" @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz"; - hash = "sha256-wMvlVFs/ZFuuYCS4MNHRFUqVY1BoOk5Ssv/1sPoatRk="; + hash = "sha256-GiQsiRfEm6KczB9gIWE9iiuYBd0NJxpmrp0J9LC7BrM="; }; patches = lib.optionals stdenv.hostPlatform.isDarwin [ From 4e3541d101059e19f1a5353150c64bf5adcad524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 15 Apr 2026 07:53:19 +0200 Subject: [PATCH 2/3] xvfb: don't update for now This avoids the rebuild. --- pkgs/by-name/xv/xvfb/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix index d5e64c146571..5514f0e1415d 100644 --- a/pkgs/by-name/xv/xvfb/package.nix +++ b/pkgs/by-name/xv/xvfb/package.nix @@ -7,6 +7,7 @@ ninja, pkg-config, xorg-server, + fetchurl, dri-pkgconfig-stub, libdrm, libGL, @@ -37,7 +38,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xvfb"; - inherit (xorg-server) src version; + #FIXME: go back to xorg-server version on nixpkgs staging + #inherit (xorg-server) src version; + version = "21.1.21"; + src = fetchurl { + url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz"; + hash = "sha256-wMvlVFs/ZFuuYCS4MNHRFUqVY1BoOk5Ssv/1sPoatRk="; + }; strictDeps = true; From c652ef26f95558ca47ddcd56f1662897b8087d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 15 Apr 2026 14:06:28 +0200 Subject: [PATCH 3/3] xorg-server: comment on xvfb and mass rebuilds Co-authored-by: whispers --- pkgs/by-name/xo/xorg-server/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix index e1c04838b820..5c63319bb74e 100644 --- a/pkgs/by-name/xo/xorg-server/package.nix +++ b/pkgs/by-name/xo/xorg-server/package.nix @@ -57,6 +57,9 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; + # `xvfb` inherits `version` and `src` from here, leading to many rebuilds. If + # necessary, these can be moved out of lockstep in order to merge updates + # quickly. version = "21.1.22"; outputs = [