diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-11-28 00:38:25 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-11-28 00:38:25 +0100 |
| commit | 0897ad7fac04fc9d814e83eed46e88c7bf9740bc (patch) | |
| tree | 9bccfdb52de4c468778ceaabe337c0539c302a30 /gnu/packages/gtk.scm | |
| parent | 6d460e80d1b06fc094374e7ba5c2503f2a897f11 (diff) | |
| parent | 9943d238e9f07dccae973b641eb7738637ce95fb (diff) | |
| download | guix-patches-0897ad7fac04fc9d814e83eed46e88c7bf9740bc.tar guix-patches-0897ad7fac04fc9d814e83eed46e88c7bf9740bc.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/gtk.scm')
| -rw-r--r-- | gnu/packages/gtk.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3ed01d1967..02ec32ca27 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -360,7 +360,7 @@ diagrams.") ("glib" ,glib "bin") ; for glib-genmarshal, etc. ("pkg-config" ,pkg-config) ;; For testing. - ("xorg-server" ,xorg-server) + ("xorg-server" ,xorg-server-for-tests) ("shared-mime-info" ,shared-mime-info))) (propagated-inputs ;; As per the pkg-config file. @@ -431,7 +431,7 @@ printing and other features typical of a source code editor.") ("pkg-config" ,pkg-config) ("vala" ,vala) ;; For testing. - ("xorg-server" ,xorg-server) + ("xorg-server" ,xorg-server-for-tests) ("shared-mime-info" ,shared-mime-info))) (propagated-inputs ;; gtksourceview-3.0.pc refers to all these. @@ -1287,7 +1287,7 @@ write GNOME applications.") (define-public perl-cairo (package (name "perl-cairo") - (version "1.106") + (version "1.107") (source (origin (method url-fetch) (uri (string-append @@ -1295,7 +1295,7 @@ write GNOME applications.") version ".tar.gz")) (sha256 (base32 - "1i25kks408c54k2zxskvg54l5k3qadzm8n72ffga9jy7ic0h6j76")))) + "0sg1gf1f2pjq7pji0zsv4rbi3bzpsx82z98k7yqxafzrvlkf27ay")))) (build-system perl-build-system) (native-inputs `(("perl-extutils-depends" ,perl-extutils-depends) |