[Backport release-26.05] xorg-server: 21.1.22 -> 21.1.23 (#527038)

This commit is contained in:
Vladimír Čunát 2026-06-03 13:02:09 +00:00 committed by GitHub
commit 313b4603e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 3 deletions

View file

@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
# `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";
version = "21.1.23";
outputs = [
"out"
@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz";
hash = "sha256-GiQsiRfEm6KczB9gIWE9iiuYBd0NJxpmrp0J9LC7BrM=";
hash = "sha256-45gy5WF9ra8HL9+fDhnl0uHCoTYHrCgLrBq6n4/hRjQ=";
};
patches = lib.optionals stdenv.hostPlatform.isDarwin [

View file

@ -3,6 +3,7 @@
{
lib,
stdenv,
fetchurl,
meson,
ninja,
pkg-config,
@ -37,7 +38,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xvfb";
inherit (xorg-server) src version;
# TODO: rebuild avoidance. revert on staging.
# inherit (xorg-server) src version;
version = "21.1.22";
src = fetchurl {
url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz";
hash = "sha256-GiQsiRfEm6KczB9gIWE9iiuYBd0NJxpmrp0J9LC7BrM=";
};
strictDeps = true;