From 73a5a3d9a5a403fd40ecf0542fbb9e8b33b3bc1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 28 Dec 2024 16:22:34 +0800 Subject: [PATCH] gnu: xorgproto: Update to 2024.1. * gnu/packages/xorg.scm (xorgproto): Update to 2024.1. (xorgproto-2024): Remove package. (xorg-server-wayland)[inputs]: Replace xorgproto-2024 with xorgproto. Change-Id: I330362aae60521c73928e1f2d4ceda05a922240d --- gnu/packages/xorg.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 34478a02bda03e2c62b1c798fd0ed03db643698a..e60ea4e27fcf5328bd4018523965b6efb965a42a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -254,14 +254,14 @@ which can be read by any architecture.") (define-public xorgproto (package (name "xorgproto") - (version "2023.2") + (version "2024.1") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/proto" "/xorgproto-" version ".tar.xz")) (sha256 (base32 - "0b4c27aq25w1fccks49p020avf9jzh75kaq5qwnww51bp1yvq7xn")))) + "0nfbbi4j130m2gxzp20hp642xizbbl68jpbzahiq8nw183yja8ip")))) (build-system gnu-build-system) (propagated-inputs ;; To get util-macros in (almost?) all package inputs. @@ -273,18 +273,6 @@ which can be read by any architecture.") the core protocol and (many) extensions for the X Window System.") (license license:x11))) -(define-public xorgproto-2024 - (package - (inherit xorgproto) - (version "2024.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://xorg/individual/proto" - "/xorgproto-" version ".tar.xz")) - (sha256 - (base32 - "0nfbbi4j130m2gxzp20hp642xizbbl68jpbzahiq8nw183yja8ip")))))) - (define-public bigreqsproto (package (name "bigreqsproto") @@ -5379,7 +5367,7 @@ EGLStream families of extensions.") wayland-protocols xkbcomp xkeyboard-config - xorgproto-2024 + xorgproto xtrans)) (native-inputs (cons pkg-config (if (%current-target-system)