summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2024-04-14 17:34:19 +0200
committerVladimír Čunát <v@cunat.cz>2024-04-14 17:34:19 +0200
commit82829f5324143e069d48f52e8af4fd8603609441 (patch)
treef2ad25801177c1b687f455233a8c6e266798772d
parentMerge pull request #304017 from LeSuisse/cosign-2.2.4-23.11 (diff)
parentxorg.xorgserver: 21.1.11 -> 21.1.12 (security) (diff)
downloadnixpkgs-82829f5324143e069d48f52e8af4fd8603609441.tar.gz
Merge #302652: xorg.xorgserver: 21.1.11 -> 21.1.12
...into release-23.11
-rw-r--r--pkgs/servers/x11/xorg/default.nix6
-rw-r--r--pkgs/servers/x11/xorg/tarballs.list2
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8786e0798627..4bd79eb6ef71 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -4159,11 +4159,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "xorg-server";
- version = "21.1.11";
+ version = "21.1.12";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/xserver/xorg-server-21.1.11.tar.xz";
- sha256 = "1vr6sc38sqipazsm61bcym2ggbgfgaamz7wf05mb31pvayyssg8x";
+ url = "mirror://xorg/individual/xserver/xorg-server-21.1.12.tar.xz";
+ sha256 = "03x954bygi6sdynk5yy3yvsfhg6i9gjhisn3x9jxvk5mw4mnw08y";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 1234f05b9723..c20d75c2fb39 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.4.tar.xz
mirror://xorg/individual/util/makedepend-1.0.8.tar.xz
mirror://xorg/individual/util/util-macros-1.20.0.tar.xz
mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz
-mirror://xorg/individual/xserver/xorg-server-21.1.11.tar.xz
+mirror://xorg/individual/xserver/xorg-server-21.1.12.tar.xz