aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-10-11 16:41:52 +0200
committerMarius Bakke <marius@gnu.org>2020-10-13 23:48:15 +0200
commit8008ef29f2f13d998e82bbc5bb66f8489321ae85 (patch)
tree8c9b17534e4452b03286d5b0b5c2c3e2af1a535a
parentf195914cc729a5295e9cbf98eff675a856368b65 (diff)
downloadguix-8008ef29f2f13d998e82bbc5bb66f8489321ae85.tar.gz
guix-8008ef29f2f13d998e82bbc5bb66f8489321ae85.zip
gnu: xorg-server: Remove graft for 1.20.9.
* gnu/packages/xorg.scm (xorg-server): Update to 1.20.9. [replacement]: Remove. (xorg-server/fixed): Remove variable.
-rw-r--r--gnu/packages/xorg.scm18
1 files changed, 2 insertions, 16 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 6faf7a5698..31f6c03e1f 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5309,8 +5309,7 @@ over Xlib, including:
(define-public xorg-server
(package
(name "xorg-server")
- (version "1.20.8")
- (replacement xorg-server/fixed)
+ (version "1.20.9")
(source
(origin
(method url-fetch)
@@ -5318,7 +5317,7 @@ over Xlib, including:
"xorg-server-" version ".tar.bz2"))
(sha256
(base32
- "0ih15m7gh1z1ly6z7g82bkni719yisqmbk61a1wgp82bxrmn8yyi"))
+ "0w9mrnffvjgmwi50kln15i8rpdskxv97r78l75wlcmg4vzhg46g2"))
(patches
(list
;; See:
@@ -5434,19 +5433,6 @@ communicates with the user via graphical controls such as buttons and
draggable titlebars and borders.")
(license license:x11)))
-(define xorg-server/fixed ; security fixes
- (package
- (inherit xorg-server)
- (version "1.20.9")
- (source
- (origin
- (inherit (package-source xorg-server))
- (uri (string-append "mirror://xorg/individual/xserver/"
- "xorg-server-" version ".tar.bz2"))
- (sha256
- (base32
- "0w9mrnffvjgmwi50kln15i8rpdskxv97r78l75wlcmg4vzhg46g2"))))))
-
;; This package is intended to be used when building GTK+.
;; Note: It's currently marked as "hidden" to avoid having two non-eq?
;; packages with the same name and version.