From fc0ed8c9c947d1f6adbd5f83c2149b6214c6110c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 12 Oct 2017 19:35:43 +0200 Subject: Revert "gnu: xorg-server: Make the test-variant visible." Hiding/unhiding changes the derivation and thus this caused too many rebuilds for 'master'. This reverts commit 8cf892e6cd488fe9c1dee8e90c5474315378cbeb. --- gnu/packages/xorg.scm | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index dea829b569..c498481bcf 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5213,20 +5213,23 @@ draggable titlebars and borders.") (license license:x11))) ;; 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. (define-public xorg-server-1.19.3 - (package - (inherit xorg-server) - (name "xorg-server") - (version "1.19.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/xserver/" - name "-" version ".tar.bz2")) - (sha256 - (base32 - "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7")))))) + (hidden-package + (package + (inherit xorg-server) + (name "xorg-server") + (version "1.19.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xserver/" + name "-" version ".tar.bz2")) + (sha256 + (base32 + "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7"))))))) (define-public xorg-server-xwayland (package -- cgit v1.2.3 From 24384c39ad0bdb9efc9bad125bdf1c2b239c02b5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 12 Oct 2017 20:02:39 +0200 Subject: gnu: xorg-server: Update to 1.19.5. [security fixes] Fixes CVE-2017-{12176..12187}. See * gnu/packages/xorg.scm (xorg-server): Update to 1.19.5. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c498481bcf..e868139f95 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5078,7 +5078,7 @@ over Xlib, including: (define-public xorg-server (package (name "xorg-server") - (version "1.19.4") + (version "1.19.5") (source (origin (method url-fetch) @@ -5087,7 +5087,7 @@ over Xlib, including: name "-" version ".tar.bz2")) (sha256 (base32 - "1a690fzv5l5ks45g9zhlzdskdq8q73mcbpb9a3wz3shxm778lxda")) + "0iql4pgsgpyqcrd3256pv227cdadvz01ych61n0d41ixp67gmzqq")) (patches (list ;; See: -- cgit v1.2.3 From 9f9c36f5c4c38209161e9806300371b07af4808f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 12 Oct 2017 23:32:44 +0200 Subject: gnu: Update home page URLs for Xorg packages. * gnu/packages/xorg.scm (imake, lndir, libxshmfence) (xorg-rgb, xinit, xterm): Update 'home-page' following redirects. --- gnu/packages/xorg.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e868139f95..4caa3d9ff7 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -138,7 +138,7 @@ (string-append "SHELL=" (which "bash")) (string-append "--prefix=" out))) (zero? (system* "make" "install")))))))))) - (home-page "http://www.x.org") + (home-page "https://www.x.org/") (synopsis "Source code configuration and build system") (description "Imake is a deprecated source code configuration and build system which @@ -167,7 +167,7 @@ autotools system.") `(("pkg-config" ,pkg-config))) (inputs `(("xproto" ,xproto))) - (home-page "http://www.x.org") + (home-page "https://www.x.org/") (synopsis "Symlink directory into tree") (description "Create a shadow directory of symbolic links to another directory tree.") @@ -1037,7 +1037,7 @@ of new capabilities and controls for text keyboards.") (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("xproto" ,xproto))) - (home-page "http://xorg.freedesktop.org") + (home-page "https://www.x.org/") (synopsis "Xorg shared memory fences library") (description "This library provides an interface to shared-memory fences for @@ -4454,7 +4454,7 @@ formatted dump file, such as produced by xwd.") `(("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "X color name database") (description "This package provides the X color name database.") @@ -5641,7 +5641,7 @@ The XCB util-wm module provides the following libraries: `(("pkg-config" ,pkg-config))) (propagated-inputs `(("xauth" ,xauth))) - (home-page "http://x.org") + (home-page "https://www.x.org/") (synopsis "Commands to start the X Window server") (description "The xinit program is used to start the X Window System server and a @@ -5775,7 +5775,7 @@ to answer a question. Xmessage can also exit after a specified time.") ("libXt" ,libxt) ("xproto" ,xproto) ("libXaw" ,libxaw))) - (home-page "http://invisible-island.net/xterm") + (home-page "http://invisible-island.net/xterm/") (synopsis "Terminal emulator for the X Window System") (description "The xterm program is a terminal emulator for the X Window System. It -- cgit v1.2.3