aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-08-26 16:17:31 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-08-26 16:17:31 +0200
commit60ecc10f18117b5f1603d7e4d52add8a6427ab0d (patch)
treeb35692074250ad63a6fdd8c2e4d2a8ced1029275 /gnu
parent8ad65841030759797bf3fd39261ca17a561ec51f (diff)
downloadguix-60ecc10f18117b5f1603d7e4d52add8a6427ab0d.tar
guix-60ecc10f18117b5f1603d7e4d52add8a6427ab0d.tar.gz
gnu: xorg-server@1.19.3: Rename to "xorg-server-for-tests".
...and update to the latest xorg-server. * gnu/packages/gtk.scm (gtk+, gtkmm, girara): Change XORG-SERVER-1.19.3 references to XORG-SERVER-FOR-TESTS. * gnu/packages/pdf.scm (zathura)[native-inputs]: Likewise. * gnu/packages/xorg.scm (xorg-server-1.19.3): Rename to ... (xorg-server-for-tests): ... this.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/gtk.scm10
-rw-r--r--gnu/packages/pdf.scm2
-rw-r--r--gnu/packages/xorg.scm15
3 files changed, 8 insertions, 19 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 38b65946b8..caa9e38a9e 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -715,9 +715,9 @@ application suites.")
("python-wrapper" ,python-wrapper)
;; By using a special xorg-server for GTK+'s tests, we reduce the impact
;; of updating xorg-server directly on the master branch.
- ("xorg-server" ,xorg-server-1.19.3)))
+ ("xorg-server" ,xorg-server-for-tests)))
(arguments
- `(#:disallowed-references (,xorg-server-1.19.3)
+ `(#:disallowed-references (,xorg-server-for-tests)
;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes
;; to "doc".
#:configure-flags (list (string-append "--with-html-dir="
@@ -1081,7 +1081,7 @@ toolkit.")
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ;for 'glib-compile-resources'
- ("xorg-server" ,xorg-server-1.19.3)))
+ ("xorg-server" ,xorg-server-for-tests)))
(propagated-inputs
`(("pangomm" ,pangomm)
("cairomm" ,cairomm)
@@ -1092,7 +1092,7 @@ toolkit.")
`(;; XXX: Tests require C++14 or later. Remove this when the default
;; compiler is >= GCC6.
#:configure-flags '("CXXFLAGS=-std=gnu++14")
- #:disallowed-references (,xorg-server-1.19.3)
+ #:disallowed-references (,xorg-server-for-tests)
#:phases (modify-phases %standard-phases
(add-before 'check 'run-xvfb
(lambda* (#:key inputs #:allow-other-keys)
@@ -1376,7 +1376,7 @@ and routines to assist in editing internationalized text.")
("check" ,check)
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
- ("xorg-server" ,xorg-server-1.19.3)))
+ ("xorg-server" ,xorg-server-for-tests)))
;; Listed in 'Requires.private' of 'girara.pc'.
(propagated-inputs `(("gtk+" ,gtk+)))
(arguments
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index b82222c2fe..0feffec541 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -511,7 +511,7 @@ by using the poppler rendering engine.")
;; For tests.
("check" ,check)
- ("xorg-server" ,xorg-server-1.19.3)))
+ ("xorg-server" ,xorg-server-for-tests)))
(inputs `(("sqlite" ,sqlite)))
;; Listed in 'Requires.private' of 'zathura.pc'.
(propagated-inputs `(("cairo" ,cairo)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 5de3becf79..6b99a3a8a8 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5198,21 +5198,10 @@ draggable titlebars and borders.")
;; 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
+(define-public xorg-server-for-tests
(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")))))))
+ (inherit xorg-server))))
(define-public xorg-server-xwayland
(package