[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/04: Revert "gnu: xorg-server: Make the test-variant visible."
From: |
Marius Bakke |
Subject: |
04/04: Revert "gnu: xorg-server: Make the test-variant visible." |
Date: |
Thu, 12 Oct 2017 13:38:30 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit fc0ed8c9c947d1f6adbd5f83c2149b6214c6110c
Author: Marius Bakke <address@hidden>
Date: Thu Oct 12 19:35:43 2017 +0200
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(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index dea829b..c498481 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