mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-21 16:11:22 +00:00
xorg-server: 21.1.23 -> 21.1.24
announcement: https://lists.x.org/archives/xorg-announce/2026-July/003718.html
advisory: https://lists.x.org/archives/xorg-announce/2026-July/003716.html
Fixes: CVE-2026-55999, CVE-2026-56000
(cherry picked from commit 4c4f2e325f)
This commit is contained in:
committed by
github-actions[bot]
parent
27e7cf3a46
commit
3cd42154d4
@@ -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.23";
|
||||
version = "21.1.24";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-45gy5WF9ra8HL9+fDhnl0uHCoTYHrCgLrBq6n4/hRjQ=";
|
||||
hash = "sha256-Gk6zbKZcw7G5NlZtZ3qXhuE8Ec1YBulRrFXz9c45hK8=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
|
||||
@@ -38,7 +38,14 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xvfb";
|
||||
|
||||
inherit (xorg-server) src version;
|
||||
# TODO: commented out for rebuild avoidance after xorg-server update. revert
|
||||
# on staging.
|
||||
# inherit (xorg-server) src version;
|
||||
version = "21.1.23";
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-45gy5WF9ra8HL9+fDhnl0uHCoTYHrCgLrBq6n4/hRjQ=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user