~ruther/guix-local

f484a50d50c3778df76d63533634a71cd7301558 — Marius Bakke 8 years ago 0efea21 + de6f6ef
Merge branch 'staging'
M gnu/local.mk => gnu/local.mk +2 -1
@@ 638,7 638,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/glog-gcc-5-demangling.patch		\
  %D%/packages/patches/gmp-arm-asm-nothumb.patch		\
  %D%/packages/patches/gmp-faulty-test.patch			\
  %D%/packages/patches/gnome-shell-CVE-2017-8288.patch		\
  %D%/packages/patches/gnome-tweak-tool-search-paths.patch	\
  %D%/packages/patches/gnucash-price-quotes-perl.patch		\
  %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \


@@ 730,6 729,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/libevent-2.1-skip-failing-test.patch	\
  %D%/packages/patches/libextractor-ffmpeg-3.patch		\
  %D%/packages/patches/libgit2-0.25.1-mtime-0.patch		\
  %D%/packages/patches/libgdata-fix-tests.patch			\
  %D%/packages/patches/libgdata-glib-duplicate-tests.patch	\
  %D%/packages/patches/libgit2-use-after-free.patch		\
  %D%/packages/patches/libjxr-fix-function-signature.patch	\
  %D%/packages/patches/libjxr-fix-typos.patch			\

M gnu/packages/geo.scm => gnu/packages/geo.scm +2 -2
@@ 75,7 75,7 @@ topology functions.")
(define-public gnome-maps
  (package
    (name "gnome-maps")
    (version "3.18.3")
    (version "3.24.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 83,7 83,7 @@ topology functions.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1vdnr2wmhqhql2gxd5n1ijwk88qhim14izbkczncg35846hfsr5i"))))
                "1mnhcrawdp6fyqylh0m8l259xdd7pqwibrjyl54rmsvnm8vfrwsy"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     `(#:configure-flags ; Ensure that geoclue is referred to by output.

M gnu/packages/gl.scm => gnu/packages/gl.scm +2 -2
@@ 217,7 217,7 @@ also known as DXTn or DXTC) for Mesa.")
(define-public mesa
  (package
    (name "mesa")
    (version "17.0.4")
    (version "17.0.6")
    (source
      (origin
        (method url-fetch)


@@ 227,7 227,7 @@ also known as DXTn or DXTC) for Mesa.")
                                  version "/mesa-" version ".tar.xz")))
        (sha256
         (base32
          "0im3ca1vwwmkjf5w761vh7vabr4vrrdxpckr0wm974x18n2xqs8j"))
          "17d60jjzg4ddm95gk2cqx0xz6b9anmmz6ax4majwr3gis2yg7v49"))
        (patches
         (search-patches "mesa-fix-32bit-test-failures.patch"
                         "mesa-wayland-egl-symbols-check-mips.patch"

M gnu/packages/glib.scm => gnu/packages/glib.scm +13 -21
@@ 67,7 67,7 @@
(define dbus
  (package
    (name "dbus")
    (version "1.10.16")
    (version "1.10.18")
    (source (origin
              (method url-fetch)
              (uri (string-append


@@ 75,7 75,7 @@
                    version ".tar.gz"))
              (sha256
               (base32
                "121kqkjsd3vgf8vca8364xl44qa5086h7qy5zs5f1l78ldpbmc57"))
                "0jjirhw6xwz2ffmbg5kr79108l8i1bdaw7szc67n3qpkygaxsjb0"))
              (patches (search-patches "dbus-helper-search-path.patch"))))
    (build-system gnu-build-system)
    (arguments


@@ 137,7 137,7 @@ shared NFS home directories.")
(define glib
  (package
   (name "glib")
   (version "2.50.3")
   (version "2.52.2")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/"


@@ 145,7 145,7 @@ shared NFS home directories.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "16frrwhc1yqkzx6bgh3060g94dr2biab17fb01mrni819jzr9vl2"))
              "1l65kab6jr9zlllgbjcbvrbgah3sdd577fpw4pdb2j195ag5s3ph"))
            (patches (search-patches "glib-tests-timer.patch"))))
   (build-system gnu-build-system)
   (outputs '("out"           ; everything


@@ 289,14 289,14 @@ dynamic loading, and an object system.")
(define gobject-introspection
  (package
    (name "gobject-introspection")
    (version "1.50.0")
    (version "1.52.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/"
                   "gobject-introspection/" (version-major+minor version)
                   "/gobject-introspection-" version ".tar.xz"))
             (sha256
              (base32 "1i9pccig8mv6qf0c1z8fcapays190nmr7j6pyc7cfhzmcv39fr8w"))
              (base32 "1x5gkyrglv3dn9b4fsgw6asqgjw1wj7qc37g9pyac6pyaa6w7l1f"))
             (modules '((guix build utils)))
             (snippet
              '(substitute* "tools/g-ir-tool-template.in"


@@ 492,7 492,7 @@ has an ease of use unmatched by other C++ callback libraries.")
(define glibmm
  (package
    (name "glibmm")
    (version "2.50.0")
    (version "2.50.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/glibmm/"


@@ 500,7 500,7 @@ has an ease of use unmatched by other C++ callback libraries.")
                                 "/glibmm-" version ".tar.xz"))
             (sha256
              (base32
               "152yz5w0lx0y5j9ml72az7pc83p4l92bc0sb8whpcazldqy6wwnz"))))
               "1926b3adx903hzvdp8glblsgjyadzqnwgkj8hg605d4wv98m1n0z"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases (alist-cons-before


@@ 573,7 573,7 @@ useful for C++.")
(define-public python-pygobject
  (package
    (name "python-pygobject")
    (version "3.22.0")
    (version "3.24.1")
    (source
     (origin
       (method url-fetch)


@@ 582,11 582,13 @@ useful for C++.")
                           "/pygobject-" version ".tar.xz"))
       (sha256
        (base32
         "1ryblpc4wbhxcwf7grgib4drrab5xi6p78ihhrx0zj7g13xrrch8"))))
         "1zdzznrj2s1gsrv2z4r0n88fzba8zjc1n2r313xi77lhl1daja56"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("which" ,which)
       ("glib-bin" ,glib "bin")         ;for tests: glib-compile-schemas
       ;for tests: dbus-run-session and glib-compile-schemas
       ("dbus" ,dbus)
       ("glib-bin" ,glib "bin")
       ("pkg-config" ,pkg-config)))
    (inputs
     `(("python" ,python)


@@ 596,16 598,6 @@ useful for C++.")
     ;; pygobject-3.0.pc refers to all these.
     `(("glib" ,glib)
       ("libffi" ,libffi)))
    (arguments
     ;; TODO: failing tests: test_native_calls_async
     ;; test_native_calls_async_errors test_native_calls_sync
     ;; test_native_calls_sync_errors test_python_calls_async
     ;; test_python_calls_async_error test_python_calls_async_error_result
     ;; test_python_calls_sync test_python_calls_sync_errors
     ;; test_python_calls_sync_noargs test_callback_user_data_middle_none
     ;; test_callback_user_data_middle_single
     ;; test_callback_user_data_middle_tuple
     '(#:tests? #f))
    ;; For finding typelib files, since gobject-introscpetion isn't propagated.
    (native-search-paths (package-native-search-paths gobject-introspection))
    (home-page "https://live.gnome.org/PyGObject")

M gnu/packages/gnome.scm => gnu/packages/gnome.scm +191 -154
@@ 14,7 14,7 @@
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org>
;;; Copyright © 2016 Jochem Raat <jchmrt@riseup.net>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>


@@ 46,6 46,7 @@
  #:use-module (guix download)
  #:use-module (guix git-download)
  #:use-module (guix utils)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system trivial)


@@ 237,6 238,56 @@ relationship modeling, and network diagrams.  The program supports various file
formats like PNG, SVG, PDF and EPS.")
      (license license:gpl2+))))

(define-public libgdata
  (package
    (name "libgdata")
    (version "0.16.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
                                  (version-major+minor version)  "/"
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "09q8h1129xjpw33rvzz7856drygxwlm0s64z9cm0vbmjxiqy0h47"))
              (patches
               (search-patches "libgdata-fix-tests.patch"
                               "libgdata-glib-duplicate-tests.patch"))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases
       (modify-phases %standard-phases
         (add-before 'check 'use-empty-ssl-cert-file
           (lambda _
             ;; The ca-certificates.crt is not available in the build
             ;; environment.
             (setenv "SSL_CERT_FILE" "/dev/null")
             #t)))))
    (native-inputs
     `(("glib:bin" ,glib "bin")
       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
       ("intltool" ,intltool)
       ("pkg-config" ,pkg-config)
       ("uhttpmock" ,uhttpmock)))
    (inputs
     `(("cyrus-sasl" ,cyrus-sasl)
       ("glib" ,glib)
       ("glib-networking" ,glib-networking)
       ("json-glib" ,json-glib)
       ("libsoup" ,libsoup)))
    (propagated-inputs
     `(("gcr" ,gcr)
       ("gnome-online-accounts" ,gnome-online-accounts)
       ("liboauth" ,liboauth)
       ("libxml2" ,libxml2)))
    (home-page "https://wiki.gnome.org/Projects/libgdata")
    (synopsis "Library for accessing online service APIs")
    (description
     "libgdata is a GLib-based library for accessing online service APIs using
the GData protocol — most notably, Google's services.  It provides APIs to
access the common Google services, and has full asynchronous support.")
    (license license:lgpl2.1+)))

(define-public gnome-common
  (package
    (name "gnome-common")


@@ 262,7 313,7 @@ commonly used macros.")
(define-public gnome-desktop
  (package
    (name "gnome-desktop")
    (version "3.22.2")
    (version "3.24.2")
    (source
     (origin
      (method url-fetch)


@@ 271,7 322,7 @@ commonly used macros.")
                          name "-" version ".tar.xz"))
      (sha256
       (base32
        "074yjz4g9gii045v2pl1ad34hcg92ci04ynxqcabwnf3lvvypmsi"))))
        "0pkq5l1llw8gkjhfq6y58iyj6wac8dh1mc3rzjzn6nd7lrkdx8cg"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("gobject-introspection" ,gobject-introspection)


@@ 339,7 390,7 @@ and keep up to date translations of documentation.")
(define-public gnome-disk-utility
  (package
    (name "gnome-disk-utility")
    (version "3.22.1")
    (version "3.24.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 347,7 398,7 @@ and keep up to date translations of documentation.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1hqynlcgwm72il2rdml98gcarz0alsgxs5xf6ww2x0czaj3s3953"))))
                "18akarcbhm8djlmz49jzavc7qx8dg71gvxc9xd23p0bwjj4h93w7"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin")


@@ 521,7 572,7 @@ forgotten when the session ends.")
(define-public evince
  (package
    (name "evince")
    (version "3.22.1")
    (version "3.24.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"


@@ 529,15 580,10 @@ forgotten when the session ends.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
               "0713mcrym5ykhl5smqxi6m9578gz3nkibmkmc794amss7gdkkm7k"))))
               "13yw0i68dgqp9alyliy3zifszh7rikkpi1xbz5binvxxgfpraf04"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     `(#:configure-flags '("--disable-nautilus")

       ;; FIXME: Tests fail with:
       ;;   ImportError: No module named gi.repository
       ;; Where should that module come from?
       #:tests? #f
       #:phases
       (modify-phases %standard-phases
         (add-before 'install 'skip-gtk-update-icon-cache


@@ 593,7 639,7 @@ on the GNOME Desktop with a single simple application.")
(define-public gsettings-desktop-schemas
  (package
    (name "gsettings-desktop-schemas")
    (version "3.22.0")
    (version "3.24.0")
    (source
     (origin
      (method url-fetch)


@@ 602,7 648,7 @@ on the GNOME Desktop with a single simple application.")
                          name "-" version ".tar.xz"))
      (sha256
       (base32
        "1qgalzqwg0fl0n22vslqcsnsmj9kc54qj25ib16rxaf36jxcf1hg"))))
        "145vpcljy4660cnk8zk91qf7ywa7hqfl5hhw025gy8hxcqzklmzn"))))
    (build-system gnu-build-system)
    (inputs
     `(("glib" ,glib)))


@@ 954,16 1000,18 @@ the GNOME desktop environment.")
(define-public libcroco
  (package
    (name "libcroco")
    (replacement libcroco/fixed)
    (version "0.6.11")
    (version "0.6.12")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
                                  (version-major+minor version)  "/"
                                  name "-" version ".tar.xz"))
              (patches
                (search-patches "libcroco-CVE-2017-7960.patch"
                                "libcroco-CVE-2017-7961.patch"))
              (sha256
               (base32
                "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk"))))
                "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)))


@@ 982,19 1030,6 @@ XML/CSS rendering engine.")
    ;; LGPLv2.1-only.
    (license license:lgpl2.1)))

(define libcroco/fixed
  (package
    (inherit libcroco)
    (replacement #f)
    (source
      (origin
        (inherit (package-source libcroco))
        (patches
          (append
            (origin-patches (package-source libcroco))
            (search-patches "libcroco-CVE-2017-7960.patch"
                            "libcroco-CVE-2017-7961.patch")))))))

(define-public libgsf
  (package
    (name "libgsf")


@@ 1698,7 1733,7 @@ Hints specification (EWMH).")
(define-public gnumeric
  (package
    (name "gnumeric")
    (version "1.12.32")
    (version "1.12.34")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 1706,7 1741,7 @@ Hints specification (EWMH).")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1s3dxvdwzmppsp2dfg90rccilf4hknhwjdy7lazr9sys58zchyx0"))))
                "09f7h4lvwzyl0amd3axapwbsrnrvvpwxyhs540jlrv425n0j0j8b"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     `(;; The gnumeric developers don't worry much about failing tests.


@@ 1739,7 1774,9 @@ Hints specification (EWMH).")
       ("zlib" ,zlib)))
    (native-inputs
     `(("bison" ,bison)
       ("docbook-xml" ,docbook-xml)
       ("intltool" ,intltool)
       ("itstool" ,itstool)
       ("glib:bin" ,glib "bin")
       ("pkg-config" ,pkg-config)))
    (home-page "http://www.gnumeric.org")


@@ 1829,7 1866,7 @@ passwords in the GNOME keyring.")
(define-public vala
  (package
    (name "vala")
    (version "0.34.4")
    (version "0.36.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 1837,7 1874,7 @@ passwords in the GNOME keyring.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "10vbd74jazc3vhfagzx8v197bshrg61hnjzna6y3wmhljhrvs5vb"))))
                "0706izk9prxqclm7gv4f63diwnlc1llvfl5sc9ghqbgn076lx2mc"))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases


@@ 2076,7 2113,7 @@ configuration storage systems.")
(define-public json-glib
  (package
    (name "json-glib")
    (version "1.2.2")
    (version "1.2.8")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 2084,14 2121,7 @@ configuration storage systems.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "08d6449sgnwfh92x8rhwsm03g8frv0mvp3s4wl3cskw25asql4pa"))
              (modules '((guix build utils)))
              (snippet
               ;; Don't duplicate test names.
               ;; <https://bugzilla.gnome.org/show_bug.cgi?id=755977>.
               '(substitute* "json-glib/tests/builder.c"
                  (("\"/builder/complex\", test_builder_empty")
                   "\"/builder/empty\", test_builder_empty")))))
                "02pl0wl3mf47c038bgv2r4pa6pr6y3shjhxn1l7s3rrrgl1sjmgx"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("glib" ,glib "bin")              ;for glib-mkenums and glib-genmarshal


@@ 2265,7 2295,7 @@ libxml to ease remote use of the RESTful API.")
(define-public libsoup
  (package
    (name "libsoup")
    (version "2.56.0")
    (version "2.58.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/libsoup/"


@@ 2273,14 2303,17 @@ libxml to ease remote use of the RESTful API.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1r8zz270qdg92gbsvy61d51y1cj7hp059h2f4xpvqiw2vrqnn8fq"))))
                "1fggmshk2mfsyfvml6paki65xj9rv1s5p7ds41xmnx6yazsnkik2"))))
    (build-system gnu-build-system)
    (outputs '("out" "doc"))
    (arguments
     `(#:configure-flags
       (list (string-append "--with-html-dir="
                            (assoc-ref %outputs "doc")
                            "/share/gtk-doc/html"))
                            "/share/gtk-doc/html")
             (string-append "--with-apache-module-dir="
                            (assoc-ref %build-inputs "httpd")
                            "/modules"))
       #:phases
       (modify-phases %standard-phases
         (add-before 'configure 'disable-unconnected-socket-test


@@ 2298,6 2331,9 @@ libxml to ease remote use of the RESTful API.")
                       ;; The ca-certificates.crt is not available in the build
                       ;; environment.
                       (setenv "SSL_CERT_FILE" "/dev/null")
                       ;; HTTPD in Guix uses mod_event and does not build prefork.
                       (substitute* "tests/httpd.conf"
                         (("^LoadModule mpm_prefork_module.*$") "\n"))
                       #t))
         (replace 'install
                  (lambda _


@@ 2383,7 2419,7 @@ and other secrets.  It communicates with the \"Secret Service\" using DBus.")
(define-public gnome-mines
  (package
    (name "gnome-mines")
    (version "3.22.2")
    (version "3.24.0")
    (source
     (origin
       (method url-fetch)


@@ 2392,7 2428,7 @@ and other secrets.  It communicates with the \"Secret Service\" using DBus.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "1wia0nj5i244m6pq3lridvk3vx9yipsa9l921nsskd97115mnyza"))))
         "1xh2as2xmh7gx45gpnl0fh9xjpvyyn3m84qgv41kyp2s4clsyqz6"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:phases


@@ 2421,7 2457,7 @@ floating in an ocean using only your brain and a little bit of luck.")
(define-public gnome-sudoku
  (package
    (name "gnome-sudoku")
    (version "3.22.2")
    (version "3.24.0")
    (source
     (origin
       (method url-fetch)


@@ 2430,7 2466,7 @@ floating in an ocean using only your brain and a little bit of luck.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "1sz2ln2nc9ff7zigghil32vbmr2qhb98dc0rbrz755rlrsh8pi08"))))
         "1mw5ykk7wr0r9770jj5270f07rjws0pmpjs0b1fywj4li13r98h4"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)


@@ 2456,7 2492,7 @@ more fun.")
(define-public gnome-terminal
  (package
    (name "gnome-terminal")
    (version "3.24.1")
    (version "3.24.2")
    (source
     (origin
       (method url-fetch)


@@ 2465,7 2501,7 @@ more fun.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "1q303bljcr06w3ra737kq1hpjda45wk16kmrixxwldf3zkk2dgx7"))))
         "03zcvxlzg7n4pz65vrg5xj3qpkqr4bz162mgmaz4bjh71b1xl7i8"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:configure-flags


@@ 2707,7 2743,7 @@ service via the system message bus.")
(define-public libgweather
  (package
    (name "libgweather")
    (version "3.20.4")
    (version "3.24.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 2715,7 2751,7 @@ service via the system message bus.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1higj4nmn3srqjbzl4iva7c0b4fkdq74xi4b35xd0qc4qiawbkbx"))))
                "0ggspn3wmlkdxpfv4ym68qn1mzqc3hv666sykv8sv1ah40rbk28h"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags


@@ 2762,7 2798,7 @@ services for numerous locations.")
(define-public gnome-settings-daemon
  (package
    (name "gnome-settings-daemon")
    (version "3.22.1")
    (version "3.24.2")
    (source
     (origin
       (method url-fetch)


@@ 2771,7 2807,7 @@ services for numerous locations.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "1finsr7yqvix6n3rdwclv4fpgagmz6xyrk3qzapkn9ljv76rfzdm"))))
         "1jnw920zn4cadhgmcv2q5ylzqhwm1rmrhf3a14q8mvp38hkdgaaa"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     `(;; Color management test can't reach the colord system service.


@@ 2889,7 2925,7 @@ which are easy to play with the aid of a mouse.")
(define-public devhelp
  (package
    (name "devhelp")
    (version "3.22.0")
    (version "3.24.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 2897,7 2933,7 @@ which are easy to play with the aid of a mouse.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1c7zqn8apm1lnpsp74bd880rga2vi5wxfjghqdgwqf6j28pf1jjr"))))
                "0c74rk46dy3kvy78m42jl3ip56c5536zmy8v1lbascjmh4fdwn28"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("intltool" ,intltool)


@@ 2948,9 2984,13 @@ throughout GNOME for API documentation).")
       ("cairo" ,cairo)
       ("pango" ,pango)
       ("gstreamer" ,gstreamer)
       ("gst-plugins-base" ,gst-plugins-base)))
       ("gst-plugins-base" ,gst-plugins-base)
       ("wayland" ,wayland)))
    (arguments
     `(#:configure-flags (list "--enable-cogl-gst"
                               "--enable-wayland-egl-platform"
                               "--enable-wayland-egl-server"

                               ;; Arrange to pass an absolute file name to
                               ;; dlopen for libGL.so.
                               (string-append "--with-gl-libname="


@@ 3355,7 3395,7 @@ for application developers.")
(define-public totem
  (package
    (name "totem")
    (version "3.22.0")
    (version "3.24.0")
    (source
     (origin
       (method url-fetch)


@@ 3364,7 3404,7 @@ for application developers.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "1sjgjqhpsh3kipnbc8y31xz64s61xjayxq98pi0vkgbl2rdmnsh2"))))
         "00cdlll5b0wj5ckl1pc0a3g39a0hlq0gxkcsh1f6p20fjixqzmwv"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)


@@ 3522,7 3562,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.")
(define-public eog
 (package
   (name "eog")
   (version "3.20.5")
   (version "3.24.1")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3530,7 3570,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "0fqvfc4y1lbv0awh8dbx9khfha0hdkmnj1lzw5jq0l7jmahwbrz6"))))
              "1rr7zy8afqgl15j1zz8l37svyv6bw4r3l04yf70zlnf1w8bf27pm"))))
   (build-system glib-or-gtk-build-system)
   (arguments
    `(#:phases


@@ 3600,7 3640,7 @@ part of udev-extras, then udev, then systemd.  It's now a project on its own.")
(define-public gvfs
  (package
    (name "gvfs")
    (version "1.30.3")
    (version "1.32.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3608,7 3648,7 @@ part of udev-extras, then udev, then systemd.  It's now a project on its own.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0xgis1kgglnazy1vm66xiqyz8yvvmiad3h0g3agg7ryai6aa495q"))))
                "1pkahczniar1yyas7awcqpkb4ca8l7qa4msn6mr29m89mgnwkdnh"))))
    (build-system gnu-build-system)
    (arguments
     '(#:tests? #f)) ; XXX: requiring `pidof'


@@ 3753,7 3793,7 @@ work and the interface is well tested.")
(define-public epiphany
  (package
    (name "epiphany")
    (version "3.22.7")
    (version "3.24.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3761,7 3801,7 @@ work and the interface is well tested.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1167x5s0kawkqngjnzml0a11ib18raxqc4p11kacivj4jv0pwnx1"))))
                "13f5h7mbxdyjf93jp46hiaxsrngpr6frgf69d8iza7arc060vg2s"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     ;; FIXME: tests run under Xvfb, but fail with:


@@ 3784,6 3824,7 @@ work and the interface is well tested.")
       ("glib-networking" ,glib-networking)
       ("gnome-desktop" ,gnome-desktop)
       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
       ("json-glib" ,json-glib)
       ("iso-codes" ,iso-codes)
       ("libnotify" ,libnotify)
       ("libsecret" ,libsecret)


@@ 4014,7 4055,7 @@ metadata in photo and video files of various formats.")
(define-public shotwell
  (package
    (name "shotwell")
    (version "0.25.5")
    (version "0.26.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4022,7 4063,7 @@ metadata in photo and video files of various formats.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "10pv3v789hky8h7ladqzzmgvkmgy3c41n4xz0nnyjmpycwl26g29"))))
                "0xak1f69lp1yx3p8jgmr9c0z3jypi8zjpy3kiknn5n9g2f5cqq0a"))))
    (build-system glib-or-gtk-build-system)
    (propagated-inputs
     `(("dconf" ,dconf)))


@@ 4037,6 4078,7 @@ metadata in photo and video files of various formats.")
     `(("glib:bin" ,glib "bin")
       ("gstreamer" ,gstreamer)
       ("gst-plugins-base" ,gst-plugins-base)
       ("libgdata" ,libgdata)
       ("libgee" ,libgee)
       ("gexiv2" ,gexiv2)
       ("libraw" ,libraw)


@@ 4060,7 4102,7 @@ share them with others via social networking and more.")
(define-public file-roller
  (package
    (name "file-roller")
    (version "3.22.2")
    (version "3.24.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4068,7 4110,7 @@ share them with others via social networking and more.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1yaxd0lqhajszilblkidqfkaffhzml10l7ib64023y36qgf8q597"))))
                "0fkz9h9a6149crmf6311fsqlmv9wyrxk86470vxib941ppl4a581"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:phases


@@ 4102,7 4144,7 @@ such as gzip tarballs.")
(define-public gnome-session
  (package
    (name "gnome-session")
    (version "3.22.2")
    (version "3.24.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4110,7 4152,7 @@ such as gzip tarballs.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1xahljysbpnc1zafm1y2lqnmmqi2jh4fx7h2y48d9ipqnknk26in"))))
                "1vkfjsgks9czajivcg3y1krzlnilv2cnzzbdc7wrasrriqilji1v"))))
    (arguments
     '(#:phases
       (modify-phases %standard-phases


@@ 4181,7 4223,7 @@ configuration program to choose applications starting on login.")
(define-public gjs
  (package
    (name "gjs")
    (version "1.46.0")
    (version "1.48.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4189,10 4231,7 @@ configuration program to choose applications starting on login.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1m2ssa6qsipbp8lz4xbhf0nhadhv0xkdpmz1jcvl9187lwgmk0r2"))
              (modules '((guix build utils)))
              (snippet '(substitute* "test/run-with-dbus"
                          (("/bin/rm") "rm")))))
                "0cqgv460wfhwkw6j1h46v6bg29bycg6dfl7c5rv0lfcqmmw7v6v6"))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases


@@ 4207,11 4246,11 @@ configuration program to choose applications starting on login.")
            ;; For the missing /etc/machine-id.
            (setenv "DBUS_FATAL_WARNINGS" "0")

            ;; XXX: fails with:
            ;;   Failed to convert UTF-8 string to JS string: ...
            ;; TODO: actually fix it.
            (substitute* "installed-tests/js/testEverythingBasic.js"
              ((".*test_utf8_inout.*") ""))
            ;; Our mozjs-38 package does not compile the required Intl API
            ;; support for these failing tests.
            (substitute* "installed-tests/js/testLocale.js"
              ((".*toBeDefined.*") "")
              ((".*expect\\(datestr\\).*") ""))
            #t)))))
    (native-inputs
     `(("glib:bin" ,glib "bin")       ; for glib-compile-resources


@@ 4223,8 4262,9 @@ configuration program to choose applications starting on login.")
       ("xvfb" ,xorg-server)))
    (propagated-inputs
     ;; These are all in the Requires.private field of gjs-1.0.pc.
     `(("gobject-introspection" ,gobject-introspection)
       ("mozjs" ,mozjs-24)))
     `(("cairo" ,cairo)
       ("gobject-introspection" ,gobject-introspection)
       ("mozjs" ,mozjs-38)))
    (inputs
     `(("gtk+" ,gtk+)
       ("readline" ,readline)))


@@ 4298,7 4338,7 @@ powerful general purpose text editor.")
(define-public zenity
  (package
    (name "zenity")
    (version "3.22.0")
    (version "3.24.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4306,7 4346,7 @@ powerful general purpose text editor.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0rp4l0vgyjhlkpk2imfwf7b05m1qxjrm8n8kp1rv70ykf48gmk8y"))))
                "1xzpm63cib2xzr99phplhbcjzy7lahggk3gp60dvrrclxhka1w3g"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("gettext" ,gettext-minimal)


@@ 4323,24 4363,21 @@ to display dialog boxes from the commandline and shell scripts.")
    (license license:lgpl2.0+)))

(define-public mutter
  ;; Uses the gnome 3.22 branch that only contains bug fixes.
  (let ((commit "23c315ea7121e9bd108e2837d0b4beeba53c5e18"))
  (package
    (name "mutter")
    (version (git-version "3.22.2" "1" commit))
    (version "3.24.2")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url "git://git.gnome.org/mutter")
                    (commit commit)))
              (file-name (git-file-name name version))
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
                                  (version-major+minor version) "/"
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1v1f9xyzjr1ihmfwpq9kzlv2lyr9qn63ck8zny699mbp5hsi11mb"))))
     ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
     ;; versions of cogl and clutter.  As a result, many of the inputs,
     ;; propagated-inputs, and configure flags used in cogl and clutter are
     ;; needed here as well.
                "043q3384vwrkjdfhbwn9pwdml6z0g0ad0cj2fjnjzg6402i67071"))))
    ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
    ;; versions of cogl and clutter.  As a result, many of the inputs,
    ;; propagated-inputs, and configure flags used in cogl and clutter are
    ;; needed here as well.
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags


@@ 4349,8 4386,7 @@ to display dialog boxes from the commandline and shell scripts.")
       ;;      implicit declaration of function ?roundf?
       (list "--enable-compile-warnings=minimum"

             "--disable-wayland"           ; TODO enable wayland
             ;; "--enable-native-backend"  ; TODO enable the native backend
             "--enable-native-backend"

             ;; The following flags are needed for the bundled clutter
             "--enable-x11-backend=yes"


@@ 4362,9 4398,14 @@ to display dialog boxes from the commandline and shell scripts.")
                            "/lib/libGL.so"))
       #:phases
       (modify-phases %standard-phases
         (add-after 'unpack 'autoreconf
                    (lambda _
                      (zero? (system* "autoreconf" "-vfi")))))))
         ;; Replace references to systemd libraries to elogind references.
         (add-before 'configure 'use-elogind
           (lambda _
             (substitute* (list "configure"
                                "src/backends/native/meta-launcher.c"
                                "src/core/main.c")
               (("systemd") "elogind"))
             #t)))))
    (native-inputs
     `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
       ("gobject-introspection" ,gobject-introspection)


@@ 4397,17 4438,17 @@ to display dialog boxes from the commandline and shell scripts.")
       ("mesa" ,mesa)
       ("pango" ,pango)
       ("udev" ,eudev)
       ("wayland" ,wayland)
       ("wayland-protocols" ,wayland-protocols)
       ("xinput" ,xinput)))
    (inputs
     `(("gnome-desktop" ,gnome-desktop)
     `(("elogind" ,elogind)
       ("gnome-desktop" ,gnome-desktop)
       ("libcanberra-gtk" ,libcanberra)
       ("libgudev" ,libgudev)
       ("libice" ,libice)
       ("libsm" ,libsm)
       ("libxkbfile" ,libxkbfile)
       ("libxrandr" ,libxrandr)
       ("libxtst" ,libxtst)
       ("startup-notification" ,startup-notification)
       ("upower-glib" ,upower)
       ("xkeyboard-config" ,xkeyboard-config)


@@ 4419,12 4460,12 @@ to display dialog boxes from the commandline and shell scripts.")
desktop via OpenGL.  Mutter combines a sophisticated display engine using the
Clutter toolkit with solid window-management logic inherited from the Metacity
window manager.")
    (license license:gpl2+))))
    (license license:gpl2+)))

(define-public gnome-online-accounts
  (package
    (name "gnome-online-accounts")
    (version "3.22.3")
    (version "3.24.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4432,7 4473,7 @@ window manager.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "13wvnfh3hnasdnb6fhjssybj2327qihd32kpdjjb3r1qiyc8dvqb"))))
                "0yy10znqj278lnhdiqjcqxrwwv5c1jdjd0ncjbbdyh8n0q77hbwy"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.


@@ 4462,7 4503,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
(define-public evolution-data-server
  (package
    (name "evolution-data-server")
    (version "3.22.3")
    (version "3.24.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4470,26 4511,20 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0kygd46s0is6i451bqykagrfx34wjvrgjbjyyszaabnppp1dyn0c"))))
    (build-system gnu-build-system)
                "1ywqy939n27v3kchlnyxs6ikhjxmlasv6f08ap4bldgr121vkfx9"))))
    (build-system cmake-build-system)
    (arguments
     '(;; XXX: fails with:
       ;;   /Fixture/Calendar0: cleaning up pid xxxx
       ;;   t status: 139)
     '(;; XXX FIXME: 11/85 tests are failing.
       #:tests? #f
       #:configure-flags
       (let ((nss  (assoc-ref %build-inputs "nss"))
             (nspr (assoc-ref %build-inputs "nspr")))
         (list "--disable-uoa"    ; disable Ubuntu Online Accounts support
               "--disable-google" ; disable Google Contacts support
               "--disable-google-auth" ; disable Google authentication
               "--enable-vala-bindings"
               (string-append "--with-nspr-includes=" nspr "/include/nspr")
               (string-append "--with-nss-includes=" nss "/include/nss")
               (string-append "--with-nss-libs=" nss "/lib/nss")))
       (list "-DENABLE_UOA=OFF"             ;disable Ubuntu Online Accounts support
             "-DENABLE_GOOGLE=OFF"          ;disable Google Contacts support
             "-DENABLE_GOOGLE_AUTH=OFF"     ;disable Google authentication
             "-DENABLE_VALA_BINDINGS=ON"
             "-DENABLE_INTROSPECTION=ON")   ;required for Vala bindings
       #:phases
       (modify-phases %standard-phases
         (add-before 'check 'pre-check
         (add-after 'unpack 'patch-paths
          (lambda _
            (substitute* "tests/test-server-utils/e-test-server-utils.c"
              (("/bin/rm") (which "rm")))


@@ 4501,7 4536,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
       ("intltool" ,intltool)
       ("pkg-config" ,pkg-config)
       ("vala" ,vala)
       ("python" ,python)))
       ("python" ,python-wrapper)))
    (propagated-inputs
     ;; These are all in the Requires field of .pc files.
     `(("gtk+" ,gtk+)


@@ 4514,7 4549,9 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
     `(("bdb" ,bdb)
       ("gcr" ,gcr)
       ("gnome-online-accounts" ,gnome-online-accounts)
       ("libgweather" ,libgweather)))
       ("libgweather" ,libgweather)
       ("mit-krb5" ,mit-krb5)
       ("openldap" ,openldap)))
    (synopsis "Store address books and calendars")
    (home-page "https://wiki.gnome.org/Apps/Evolution")
    (description


@@ 4812,7 4849,7 @@ libxml2.")
(define-public gdm
  (package
    (name "gdm")
    (version "3.22.1")
    (version "3.24.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4820,7 4857,7 @@ libxml2.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "17wnsrv91mx14xp96wrc21g2hsjjc38yhbkw55kf7hk3yliychva"))))
                "1s2xzrwcjhfb4ra8jrxqfycs1jpv97id0f6idb2h6vjkspxbjy23"))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags


@@ 4899,7 4936,7 @@ usage and information about running processes.")
(define-public gnome-bluetooth
  (package
    (name "gnome-bluetooth")
    (version "3.20.0")
    (version "3.20.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4907,7 4944,7 @@ usage and information about running processes.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0lzbwk2kn7kp39sv5bf4ja92mfkxkc27gxxk8k86i8a8ncbcmcwk"))))
                "1zlqcz6jz4vzzr8gd1678i9s4015kiwcpr5szrwz4kmryfsm147a"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc.


@@ 4932,7 4969,7 @@ devices using the GNOME desktop.")
(define-public gnome-control-center
  (package
    (name "gnome-control-center")
    (version "3.22.1")
    (version "3.24.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4940,7 4977,7 @@ devices using the GNOME desktop.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "06h9937sjfrzjf36pxqybg4wmkc5xdhbxgdkclnkjxiiqidjjsax"))))
                "0awga40jh6gvn335mn6kyl6yg79frap1znrsz3sw2m27yldlnaiq"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:phases


@@ 5003,16 5040,15 @@ properties, screen resolution, and other GNOME parameters.")
(define-public gnome-shell
  (package
    (name "gnome-shell")
    (version "3.22.2")
    (version "3.24.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
                                  (version-major+minor version) "/"
                                  name "-" version ".tar.xz"))
              (patches (search-patches "gnome-shell-CVE-2017-8288.patch"))
              (sha256
               (base32
                "16smvjfrpyfphv479hjky5261hgl4kli4q86bcb2b8xdcav4w3yq"))))
                "1xp2ccmdrvzlczsrcplykwqwx2v4lbmkr0rxyylb06danlw9mivh"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:phases


@@ 5213,7 5249,7 @@ shared object databases, search tools and indexing.")
(define-public nautilus
  (package
    (name "nautilus")
    (version "3.22.2")
    (version "3.24.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 5221,7 5257,7 @@ shared object databases, search tools and indexing.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1cv5xsah04svxx0b6di7iah9gcwk6na2c6lp442pal9v2ybrw76f"))))
                "1cn6bmzmahzlwcd4gllsvx6dva386xm3papgzpv1r34abw73sf27"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:configure-flags


@@ 5293,7 5329,7 @@ is complete it provides a graphical representation of each selected folder.")
(define-public gnome-backgrounds
  (package
    (name "gnome-backgrounds")
    (version "3.22.1")
    (version "3.24.0")
    (source
     (origin
       (method url-fetch)


@@ 5302,7 5338,7 @@ is complete it provides a graphical representation of each selected folder.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "09gfdrm1kaz2knyghhjb0ka1kklgbcbnqgy4c90bg0v3n899ij5z"))))
         "1jkikis9k3psp6rb8axnqy86awdyg5rzfbcp9gx40a99b4hlrnnb"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("intltool" ,intltool)))


@@ 5521,7 5557,7 @@ Microsoft SkyDrive and Hotmail, using their REST protocols.")
(define-public gnome-calendar
  (package
    (name "gnome-calendar")
    (version "3.22.2")
    (version "3.24.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 5529,7 5565,7 @@ Microsoft SkyDrive and Hotmail, using their REST protocols.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "03wivk7hbyqrqcrd7jg0m2xj6q13248la2184qkf7zncnj72g5ih"))))
                "0lc0xdgn0y12i87775xyy0p3a5l82w9k49cmwl1my8r8pwf9lp6s"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("intltool" ,intltool)


@@ 5550,7 5586,7 @@ desktop.  It supports multiple calendars, monthly view and yearly view.")
(define-public gnome-dictionary
  (package
    (name "gnome-dictionary")
    (version "3.20.0")
    (version "3.24.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 5558,7 5594,7 @@ desktop.  It supports multiple calendars, monthly view and yearly view.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "08b1f5s5aqka3dwxnzmwr2fmyddjm9xw7zmqsf8r5zvfsivn7czg"))))
                "1wnrpg8yndacq0xnzc84d519yp7f28brzklm3a48xcgs1i50drs1"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin")


@@ 5580,7 5616,7 @@ existing databases over the internet.")
(define-public gnome-tweak-tool
  (package
    (name "gnome-tweak-tool")
    (version "3.22.0")
    (version "3.24.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/gnome-tweak-tool/"


@@ 5590,7 5626,7 @@ existing databases over the internet.")
                        (search-patch "gnome-tweak-tool-search-paths.patch")))
              (sha256
               (base32
                "1frs16p2284mdw65g1ldmf9cz5sn3rg16wz58gjrw5pn2cgf2six"))))
                "000ygz9wgnv8pimb6rwbjfm12vbx4138pwkq36ci0k6v827282wk"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     `(#:configure-flags '("--localstatedir=/tmp"


@@ 5631,7 5667,7 @@ GNOME Shell appearance and extension, etc.")
(define-public gnome-shell-extensions
  (package
    (name "gnome-shell-extensions")
    (version "3.22.2")
    (version "3.24.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 5639,7 5675,7 @@ GNOME Shell appearance and extension, etc.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "11wa4f9arr89a4y8nsvla5j58dzwlawjb2q1lz0jn5i9kv324z6z"))))
                "10sg87wml5cmyk90pybnr6r942ba7173sl7yplhj2sfggp0wc74s"))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags '("--enable-extensions=all")))


@@ 5895,7 5931,7 @@ handling the startup notification side.")
(define-public gnome-calculator
  (package
    (name "gnome-calculator")
    (version "3.22.2")
    (version "3.24.0")
    (source
     (origin
       (method url-fetch)


@@ 5904,7 5940,7 @@ handling the startup notification side.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "03il7xl4yr6xbzj6x1lbl16yzlb166c9h9wny1w7mj9dccnz99wr"))))
         "041d40as8y0r5d0kk83dy842711zchydwwqh71kh1lpd373qlxa4"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0.


@@ 5914,6 5950,7 @@ handling the startup notification side.")
    (inputs
     `(("gtksourceview" ,gtksourceview)
       ("libsoup" ,libsoup)
       ("mpc" ,mpc)
       ("mpfr" ,mpfr)))
    (home-page "https://wiki.gnome.org/Apps/Calculator")
    (synopsis "Desktop calculator")


@@ 6017,7 6054,7 @@ Bluefish supports many programming and markup languages.")
(define-public gnome-system-monitor
  (package
    (name "gnome-system-monitor")
    (version "3.22.2")
    (version "3.24.0")
    (source
     (origin
       (method url-fetch)


@@ 6026,7 6063,7 @@ Bluefish supports many programming and markup languages.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "10n9bl2q9xxnd6mfi4scfw5x0xyyzvnblz26q9gl8vks2nbv19b8"))))
         "1x3343hchkllj8wyifk844v8psi45kyjhphyd03fzahi4h34aay3"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin") ; for glib-mkenums.

M gnu/packages/gtk.scm => gnu/packages/gtk.scm +26 -16
@@ 50,6 50,7 @@
  #:use-module (gnu packages docbook)
  #:use-module (gnu packages enchant)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages ghostscript)
  #:use-module (gnu packages gl)


@@ 72,7 73,7 @@
(define-public atk
  (package
   (name "atk")
   (version "2.22.0")
   (version "2.24.0")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/" name "/"


@@ 80,7 81,7 @@
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "1dj47ndvspa7lghw1jvjhv3v08q5f9ab5rb395mcgjbl975gajfk"))))
              "0jbs90vacl95mwgvmqsizi1bwx5sw0rz70r9knksfwwch2dalbdv"))))
   (build-system gnu-build-system)
   (outputs '("out" "doc"))
   (arguments


@@ 170,7 171,7 @@ affine transformation (scale, rotation, shear, etc.).")
(define-public harfbuzz
  (package
   (name "harfbuzz")
   (version "1.4.3")
   (version "1.4.6")
   (source (origin
             (method url-fetch)
             (uri (string-append "https://www.freedesktop.org/software/"


@@ 178,7 179,7 @@ affine transformation (scale, rotation, shear, etc.).")
                                 version ".tar.bz2"))
             (sha256
              (base32
               "08akv3qzwnf48xajb60dfcchkmfdjkpp65a0xd8s98w81901g343"))))
               "14yj514yfy373np3gxk930a443j1zgnwg6mm0kdzzjr0rn0qp9r1"))))
   (build-system gnu-build-system)
   (outputs '("out"
              "bin")) ; 160K, only hb-view depend on cairo


@@ 208,7 209,7 @@ affine transformation (scale, rotation, shear, etc.).")
(define-public pango
  (package
   (name "pango")
   (version "1.40.3")
   (version "1.40.6")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/pango/"


@@ 216,7 217,7 @@ affine transformation (scale, rotation, shear, etc.).")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "1lqi4yncw5q0v7g5makzxyp18g5cksqyld8m1wx0qli8wxf8pfmb"))))
              "0wz5b5knpw4gfvz3ny8l6h2ca3bpqqyh55mffkyzgsd1hdrjn5fa"))))
   (build-system gnu-build-system)
   (propagated-inputs
    `(("cairo" ,cairo)


@@ 378,7 379,7 @@ printing and other features typical of a source code editor.")
(define-public gtksourceview
 (package
   (name "gtksourceview")
   (version "3.22.2")
   (version "3.24.2")
   (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"


@@ 386,7 387,7 @@ printing and other features typical of a source code editor.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
               "0pmgff3p9q1z500aiqfn5l4mmij4yfi4qhq8fxscqc89vlql5s3c"))))
               "17xqrnh2v9gba57ij2m9kngxwh19fzsqkx1rfasnv4zaqvqqhv69"))))
   (build-system gnu-build-system)
   (arguments
    '(#:phases


@@ 508,7 509,7 @@ in the GNOME project.")
(define-public at-spi2-core
  (package
   (name "at-spi2-core")
   (version "2.22.0")
   (version "2.24.1")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/" name "/"


@@ 516,7 517,7 @@ in the GNOME project.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "02n8ybhg8344mpjwvkhnzvr0qbvvl6ryi2q9irwhi0ri46ps6pj1"))))
              "0nwvjmd30rgq6d1zznavx0bdfa1xwv3jl8wnkbkwzaipp5jd140y"))))
   (build-system gnu-build-system)
   (outputs '("out" "doc"))
   (arguments


@@ 553,7 554,7 @@ is part of the GNOME accessibility project.")
(define-public at-spi2-atk
  (package
   (name "at-spi2-atk")
   (version "2.22.0")
   (version "2.24.1")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/" name "/"


@@ 561,7 562,7 @@ is part of the GNOME accessibility project.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "1h8k271ad78smm41c9bmw5dc4gki0wfy324cn2g25svkp2zfvgg8"))))
              "0zcmsq7g4jg5dpmfzkyfpa0v6hx4119c4qwkdblzzf3l9yn91p30"))))
   (build-system gnu-build-system)
   (arguments
    '(#:phases


@@ 653,7 654,7 @@ application suites.")
   (name "gtk+")
   ;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in
   ;;       mate.scm will also need to be updated.
   (version "3.22.12")
   (version "3.22.15")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/" name "/"


@@ 661,7 662,7 @@ application suites.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "1359w81sxs2izkan2rni985x78s6zr1arf469qmyw4bazg7f1yl4"))
              "1nqgb71vx222g9fd2p017948hqybnyi69xs3n2d64clim7115868"))
            (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
                                     "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
   (outputs '("out" "bin" "doc"))


@@ 673,8 674,12 @@ application suites.")
      ("libxcursor" ,libxcursor)
      ("libxi" ,libxi)
      ("libxinerama" ,libxinerama)
      ("libxkbcommon" ,libxkbcommon)
      ("libxdamage" ,libxdamage)
      ("pango" ,pango)))
      ("mesa" ,mesa)
      ("pango" ,pango)
      ("wayland" ,wayland)
      ("wayland-protocols" ,wayland-protocols)))
   (inputs
    `(("libxml2" ,libxml2)
      ;; XXX: colord depends on mozjs (through polkit), which fails on


@@ 700,7 705,12 @@ application suites.")
      ;; to "doc".
      #:configure-flags (list (string-append "--with-html-dir="
                                             (assoc-ref %outputs "doc")
                                             "/share/gtk-doc/html"))
                                             "/share/gtk-doc/html")
                              ;; The header file <gdk/gdkwayland.h> is required
                              ;; by gnome-control-center
                              "--enable-wayland-backend"
                              ;; This is necessary to build both backends.
                              "--enable-x11-backend")
      #:phases (modify-phases %standard-phases
        (add-before 'configure 'pre-configure
          (lambda _

M gnu/packages/linux.scm => gnu/packages/linux.scm +2 -2
@@ 2801,7 2801,7 @@ Bluetooth audio output devices like headphones or loudspeakers.")
(define-public bluez
  (package
    (name "bluez")
    (version "5.44")
    (version "5.45")
    (source (origin
              (method url-fetch)
              (uri (string-append


@@ 2809,7 2809,7 @@ Bluetooth audio output devices like headphones or loudspeakers.")
                    version ".tar.xz"))
              (sha256
               (base32
                "11bc6pndivd0rkqr3c8a1xd9ar9bb60gx79piskycicb3wliwchc"))))
                "1sb4aflgyrl7apricjipa8wx95qm69yja0lmn2f19g560c3v1b2c"))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags

M gnu/packages/mate.scm => gnu/packages/mate.scm +2 -2
@@ 61,7 61,7 @@
(define-public mate-themes
  (package
    (name "mate-themes")
    (version "3.22.10")
    (version "3.22.11")
    (source (origin
              (method url-fetch)
              (uri (string-append "http://pub.mate-desktop.org/releases/themes/"


@@ 69,7 69,7 @@
                                  version ".tar.xz"))
              (sha256
               (base32
                "03ficjfxa4qpx4vcshhk2zxryivckxpw7wcjgbn8xqnjk3lgzjcb"))))
                "1gfa1cny3q68y139m96iz8haiik6ygad5613gx0m4wd9hi5scafm"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)

D gnu/packages/patches/gnome-shell-CVE-2017-8288.patch => gnu/packages/patches/gnome-shell-CVE-2017-8288.patch +0 -54
@@ 1,54 0,0 @@
Fix CVE-2017-8288:

https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-8288
http://seclists.org/oss-sec/2017/q2/136

Patch copied from upstream source repository:

https://git.gnome.org/browse/gnome-shell/commit/?id=ff425d1db7082e2755d2a405af53861552acf2a1

From ff425d1db7082e2755d2a405af53861552acf2a1 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu27@gmail.com>
Date: Tue, 25 Apr 2017 17:27:42 +0200
Subject: extensionSystem: handle reloading broken extensions

Some extensions out there may fail to reload. When that happens,
we need to catch any exceptions so that we don't leave things in
a broken state that could lead to leaving extensions enabled in
the screen shield.

https://bugzilla.gnome.org/show_bug.cgi?id=781728
---
 js/ui/extensionSystem.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index a4dc29e..fc352b8 100644
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -282,12 +282,20 @@ function _onVersionValidationChanged() {
     // temporarily disable them all
     enabledExtensions = [];
     for (let uuid in ExtensionUtils.extensions)
-        reloadExtension(ExtensionUtils.extensions[uuid]);
+        try {
+            reloadExtension(ExtensionUtils.extensions[uuid]);
+        } catch(e) {
+            logExtensionError(uuid, e);
+        }
     enabledExtensions = getEnabledExtensions();
 
     if (Main.sessionMode.allowExtensions) {
         enabledExtensions.forEach(function(uuid) {
-            enableExtension(uuid);
+            try {
+                enableExtension(uuid);
+            } catch(e) {
+                logExtensionError(uuid, e);
+            }
         });
     }
 }
-- 
cgit v0.12


A gnu/packages/patches/libgdata-fix-tests.patch => gnu/packages/patches/libgdata-fix-tests.patch +325 -0
@@ 0,0 1,325 @@
From c87a112246e0bcbd5c3a8aa484a50c617d710dbf Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip.withnall@collabora.co.uk>
Date: Fri, 12 Dec 2014 17:31:01 +0000
Subject: [PATCH] tests: Eliminate ISO 8601 formatting workaround for dates

Follow up to commit 732017e4e5235e28c578cc3367fa0c4548b65495.

https://bugzilla.gnome.org/show_bug.cgi?id=739956
---
 gdata/tests/calendar.c | 20 ++++++++++----------
 gdata/tests/general.c  | 34 +++++++++++++++++-----------------
 gdata/tests/tasks.c    | 34 +++++++++++++++++-----------------
 gdata/tests/youtube.c  | 16 ++++++++--------
 4 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/gdata/tests/calendar.c b/gdata/tests/calendar.c
index bb1d609..c54ddda 100644
--- a/gdata/tests/calendar.c
+++ b/gdata/tests/calendar.c
@@ -620,7 +620,7 @@ test_event_xml (void)
 			"<gCal:guestsCanInviteOthers value='false'/>"
 			"<gCal:guestsCanSeeGuests value='false'/>"
 			"<gCal:anyoneCanAddSelf value='false'/>"
-			"<gd:when startTime='2009-04-17T15:00:00.000001+00:00' endTime='2009-04-17T17:00:00.000001+00:00'/>"
+			"<gd:when startTime='2009-04-17T15:00:00Z' endTime='2009-04-17T17:00:00Z'/>"
 			"<gd:who email='john.smith@example.com' "
 			        "rel='http://schemas.google.com/g/2005#event.organizer' "
 			        "valueString='John Smith\342\200\275'/>"
@@ -706,7 +706,7 @@ test_event_xml_dates (void)
 			"<gCal:guestsCanSeeGuests value='false'/>"
 			"<gCal:anyoneCanAddSelf value='false'/>"
 			"<gd:when startTime='2009-04-17'/>"
-			"<gd:when startTime='2009-04-17T15:00:00.000001+00:00'/>"
+			"<gd:when startTime='2009-04-17T15:00:00Z'/>"
 			"<gd:when startTime='2009-04-27' endTime='2009-05-06'/>"
 		"</entry>");
 
@@ -934,25 +934,25 @@ test_query_uri (void)
 
 	/* Check the built query URI with a normal feed URI */
 	query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com");
-	g_assert_cmpstr (query_uri, ==, "http://example.com?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00.000001+00:00"
-	                                "&recurrence-expansion-end=2010-04-17T15:00:00.000001+00:00&singleevents=true&sortorder=descending"
-	                                "&start-min=2009-04-17T15:00:00.000001+00:00&start-max=2010-04-17T15:00:00.000001+00:00&ctz=America%2FLos_Angeles&max-attendees=15"
+	g_assert_cmpstr (query_uri, ==, "http://example.com?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00Z"
+	                                "&recurrence-expansion-end=2010-04-17T15:00:00Z&singleevents=true&sortorder=descending"
+	                                "&start-min=2009-04-17T15:00:00Z&start-max=2010-04-17T15:00:00Z&ctz=America%2FLos_Angeles&max-attendees=15"
 	                                "&showdeleted=true");
 	g_free (query_uri);
 
 	/* …with a feed URI with a trailing slash */
 	query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com/");
-	g_assert_cmpstr (query_uri, ==, "http://example.com/?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00.000001+00:00"
-	                                "&recurrence-expansion-end=2010-04-17T15:00:00.000001+00:00&singleevents=true&sortorder=descending"
-	                                "&start-min=2009-04-17T15:00:00.000001+00:00&start-max=2010-04-17T15:00:00.000001+00:00&ctz=America%2FLos_Angeles&max-attendees=15"
+	g_assert_cmpstr (query_uri, ==, "http://example.com/?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00Z"
+	                                "&recurrence-expansion-end=2010-04-17T15:00:00Z&singleevents=true&sortorder=descending"
+	                                "&start-min=2009-04-17T15:00:00Z&start-max=2010-04-17T15:00:00Z&ctz=America%2FLos_Angeles&max-attendees=15"
 	                                "&showdeleted=true");
 	g_free (query_uri);
 
 	/* …with a feed URI with pre-existing arguments */
 	query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com/bar/?test=test&this=that");
 	g_assert_cmpstr (query_uri, ==, "http://example.com/bar/?test=test&this=that&q=q&futureevents=true&orderby=starttime"
-	                                "&recurrence-expansion-start=2009-04-17T15:00:00.000001+00:00&recurrence-expansion-end=2010-04-17T15:00:00.000001+00:00"
-	                                "&singleevents=true&sortorder=descending&start-min=2009-04-17T15:00:00.000001+00:00&start-max=2010-04-17T15:00:00.000001+00:00"
+	                                "&recurrence-expansion-start=2009-04-17T15:00:00Z&recurrence-expansion-end=2010-04-17T15:00:00Z"
+	                                "&singleevents=true&sortorder=descending&start-min=2009-04-17T15:00:00Z&start-max=2010-04-17T15:00:00Z"
 	                                "&ctz=America%2FLos_Angeles&max-attendees=15&showdeleted=true");
 	g_free (query_uri);
 
diff --git a/gdata/tests/general.c b/gdata/tests/general.c
index 237a908..f828d2e 100644
--- a/gdata/tests/general.c
+++ b/gdata/tests/general.c
@@ -528,8 +528,8 @@ test_entry_parse_xml (void)
 			 "<?xml version='1.0' encoding='UTF-8'?>"
 			 "<entry xmlns='http://www.w3.org/2005/Atom' xmlns:gd='http://schemas.google.com/g/2005' xmlns:ns='http://example.com/'>"
 				"<title type='text'>Testing unhandled XML</title>"
-				"<updated>2009-01-25T14:07:37.000001+00:00</updated>"
-				"<published>2009-01-23T14:06:37.000001+00:00</published>"
+				"<updated>2009-01-25T14:07:37Z</updated>"
+				"<published>2009-01-23T14:06:37Z</published>"
 				"<content type='text'>Here we test unhandled XML elements.</content>"
 				"<foobar>Test!</foobar>"
 				"<barfoo shizzle=\"zing\"/>"
@@ -569,8 +569,8 @@ test_entry_parse_xml_kind_category (void)
 			 "<?xml version='1.0' encoding='UTF-8'?>"
 			 "<entry xmlns='http://www.w3.org/2005/Atom' xmlns:gd='http://schemas.google.com/g/2005'>"
 				"<title type='text'>Testing kind categories</title>"
-				"<updated>2009-01-25T14:07:37.000001+00:00</updated>"
-				"<published>2009-01-23T14:06:37.000001+00:00</published>"
+				"<updated>2009-01-25T14:07:37Z</updated>"
+				"<published>2009-01-23T14:06:37Z</published>"
 				"<content type='text'>Here we test kind categories.</content>"
 			"<category term='http://schemas.google.com/docs/2007#file' "
 			          "scheme='http://schemas.google.com/g/2005#kind' "
@@ -620,7 +620,7 @@ test_entry_parse_json (void)
 		"{"
 			"\"title\":\"A title\","
 			"\"id\":\"some-id\","
-			"\"updated\":\"2009-01-25T14:07:37.000001+00:00\","
+			"\"updated\":\"2009-01-25T14:07:37Z\","
 			"\"etag\":\"some-etag\","
 			"\"selfLink\":\"http://example.com/\","
 			"\"kind\":\"kind#kind\","
@@ -760,8 +760,8 @@ test_entry_escaping (void)
 		"<entry xmlns='http://www.w3.org/2005/Atom' xmlns:gd='http://schemas.google.com/g/2005'>"
 			"<title type='text'>Escaped content &amp; stuff</title>"
 			"<id>http://foo.com/?foo&amp;bar</id>"
-			"<updated>2010-12-10T17:21:24.000001+00:00</updated>"
-			"<published>2010-12-10T17:21:24.000001+00:00</published>"
+			"<updated>2010-12-10T17:21:24Z</updated>"
+			"<published>2010-12-10T17:21:24Z</published>"
 			"<summary type='text'>Summary &amp; stuff</summary>"
 			"<rights>Free &amp; open source</rights>"
 			"<content type='text'>Content &amp; things.</content>"
@@ -1106,7 +1106,7 @@ test_feed_escaping (void)
 		"<feed xmlns='http://www.w3.org/2005/Atom'>"
 			"<title type='text'>Test feed &amp; stuff.</title>"
 			"<id>http://foo.com?foo&amp;bar</id>"
-			"<updated>2010-12-10T17:49:15.000001+00:00</updated>"
+			"<updated>2010-12-10T17:49:15Z</updated>"
 		"</feed>");
 	g_object_unref (feed);
 }
@@ -1157,28 +1157,28 @@ test_query_dates (void)
 	/* updated-min */
 	gdata_query_set_updated_min (query, 1373280114); /* 2013-07-08T10:41:54Z */
 	query_uri = gdata_query_get_query_uri (query, "http://example.com");
-	g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-min=2013-07-08T10:41:54.000001+00:00");
+	g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-min=2013-07-08T10:41:54Z");
 	g_free (query_uri);
 	gdata_query_set_updated_min (query, -1);
 
 	/* updated-max */
 	gdata_query_set_updated_max (query, 1373280114); /* 2013-07-08T10:41:54Z */
 	query_uri = gdata_query_get_query_uri (query, "http://example.com");
-	g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-max=2013-07-08T10:41:54.000001+00:00");
+	g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-max=2013-07-08T10:41:54Z");
 	g_free (query_uri);
 	gdata_query_set_updated_max (query, -1);
 
 	/* published-min */
 	gdata_query_set_published_min (query, 1373280114); /* 2013-07-08T10:41:54Z */
 	query_uri = gdata_query_get_query_uri (query, "http://example.com");
-	g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-min=2013-07-08T10:41:54.000001+00:00");
+	g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-min=2013-07-08T10:41:54Z");
 	g_free (query_uri);
 	gdata_query_set_published_min (query, -1);
 
 	/* published-max */
 	gdata_query_set_published_max (query, 1373280114); /* 2013-07-08T10:41:54Z */
 	query_uri = gdata_query_get_query_uri (query, "http://example.com");
-	g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-max=2013-07-08T10:41:54.000001+00:00");
+	g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-max=2013-07-08T10:41:54Z");
 	g_free (query_uri);
 	gdata_query_set_published_max (query, -1);
 
@@ -3127,7 +3127,7 @@ test_gd_reminder (void)
 	gdata_test_assert_xml (reminder,
 			 "<?xml version='1.0' encoding='UTF-8'?>"
 			 "<gd:reminder xmlns='http://www.w3.org/2005/Atom' xmlns:gd='http://schemas.google.com/g/2005' "
-				"absoluteTime='2005-06-07T00:55:00.000001+00:00' method='alert'/>");
+				"absoluteTime='2005-06-07T00:55:00Z' method='alert'/>");
 	g_object_unref (reminder);
 }
 
@@ -3218,8 +3218,8 @@ test_gd_when (void)
 	/* Check the outputted XML is the same */
 	gdata_test_assert_xml (when,
 			 "<?xml version='1.0' encoding='UTF-8'?>"
-			 "<gd:when xmlns='http://www.w3.org/2005/Atom' xmlns:gd='http://schemas.google.com/g/2005' startTime='2005-06-07T01:00:00.000001+00:00' "
-				"endTime='2005-06-07T02:00:00.000001+00:00'/>");
+			 "<gd:when xmlns='http://www.w3.org/2005/Atom' xmlns:gd='http://schemas.google.com/g/2005' startTime='2005-06-07T01:00:00Z' "
+				"endTime='2005-06-07T02:00:00Z'/>");
 	g_object_unref (when);
 
 	/* Now parse a time with different information */
@@ -3258,7 +3258,7 @@ test_gd_when (void)
 			 "<gd:when xmlns='http://www.w3.org/2005/Atom' xmlns:gd='http://schemas.google.com/g/2005' startTime='2005-06-06' "
 				"endTime='2005-06-08' valueString='This weekend'>"
 				"<gd:reminder minutes='15'/>"
-				"<gd:reminder absoluteTime='2005-06-06T00:00:00.000001+00:00' method='alert'/>"
+				"<gd:reminder absoluteTime='2005-06-06T00:00:00Z' method='alert'/>"
 				"<foobar/>"
 			 "</gd:when>");
 	g_object_unref (when);
@@ -3278,7 +3278,7 @@ test_gd_when_escaping (void)
 	gdata_test_assert_xml (when,
 	                 "<?xml version='1.0' encoding='UTF-8'?>"
 	                 "<gd:when xmlns='http://www.w3.org/2005/Atom' xmlns:gd='http://schemas.google.com/g/2005' "
-	                          "startTime='2005-06-07T01:00:00.000001+00:00' valueString='Value string &amp; stuff!'/>");
+	                          "startTime='2005-06-07T01:00:00Z' valueString='Value string &amp; stuff!'/>");
 	g_object_unref (when);
 }
 
diff --git a/gdata/tests/tasks.c b/gdata/tests/tasks.c
index 7a5bc7e..7bf3174 100644
--- a/gdata/tests/tasks.c
+++ b/gdata/tests/tasks.c
@@ -122,11 +122,11 @@ test_query_uri (void)
 	g_assert_cmpstr (query_uri, ==,
 	                 "http://example.com"
 	                 "?maxResults=10"
-	                 "&updatedMin=1970-01-01T01:53:09.000001+00:00"
-	                 "&completedMin=1970-01-01T01:34:38.000001+00:00"
-	                 "&completedMax=1970-01-01T00:20:34.000001+00:00"
-	                 "&dueMin=1970-01-01T00:39:05.000001+00:00"
-	                 "&dueMax=1970-01-01T00:57:36.000001+00:00"
+	                 "&updatedMin=1970-01-01T01:53:09Z"
+	                 "&completedMin=1970-01-01T01:34:38Z"
+	                 "&completedMax=1970-01-01T00:20:34Z"
+	                 "&dueMin=1970-01-01T00:39:05Z"
+	                 "&dueMax=1970-01-01T00:57:36Z"
 	                 "&showCompleted=true"
 	                 "&showDeleted=true"
 	                 "&showHidden=true");
@@ -148,11 +148,11 @@ test_query_uri (void)
 	g_assert_cmpstr (query_uri, ==,
 	                 "http://example.com"
 	                 "?maxResults=10"
-	                 "&updatedMin=1970-01-01T01:53:09.000001+00:00"
-	                 "&completedMin=1970-01-01T01:34:38.000001+00:00"
-	                 "&completedMax=1970-01-01T00:20:34.000001+00:00"
-	                 "&dueMin=1970-01-01T00:39:05.000001+00:00"
-	                 "&dueMax=1970-01-01T00:57:36.000001+00:00"
+	                 "&updatedMin=1970-01-01T01:53:09Z"
+	                 "&completedMin=1970-01-01T01:34:38Z"
+	                 "&completedMax=1970-01-01T00:20:34Z"
+	                 "&dueMin=1970-01-01T00:39:05Z"
+	                 "&dueMax=1970-01-01T00:57:36Z"
 	                 "&showCompleted=false"
 	                 "&showDeleted=false"
 	                 "&showHidden=false");
@@ -317,8 +317,8 @@ test_task_properties (void)
 			"\"title\": \"some-other-title\","
 			"\"notes\": \"more-notes\","
 			"\"status\": \"completed\","
-			"\"due\": \"2014-08-30T17:20:00.000001+00:00\","
-			"\"completed\": \"2014-08-30T17:20:00.000001+00:00\","
+			"\"due\": \"2014-08-30T17:20:00Z\","
+			"\"completed\": \"2014-08-30T17:20:00Z\","
 			"\"deleted\": true,"
 			"\"hidden\": false"
 		"}");
@@ -332,8 +332,8 @@ test_task_properties (void)
 			"\"title\": \"some-other-title\","
 			"\"notes\": \"more-notes\","
 			"\"status\": \"completed\","
-			"\"due\": \"2014-08-30T17:20:00.000001+00:00\","
-			"\"completed\": \"2014-08-30T17:20:00.000001+00:00\","
+			"\"due\": \"2014-08-30T17:20:00Z\","
+			"\"completed\": \"2014-08-30T17:20:00Z\","
 			"\"deleted\": false,"
 			"\"hidden\": false"
 		"}");
@@ -496,14 +496,14 @@ test_task_parser_normal (void)
 			"\"id\": \"some-id\","
 			"\"etag\": \"some-etag\","
 			"\"title\": \"some-title \\\"with quotes\\\"\","
-			"\"updated\": \"2014-08-30T19:40:00.000001+00:00\","
+			"\"updated\": \"2014-08-30T19:40:00Z\","
 			"\"selfLink\": \"http://some-uri/\","
 			"\"parent\": \"some-parent-id\","
 			"\"position\": \"some-position\","
 			"\"notes\": \"Some notes!\","
 			"\"status\": \"needsAction\","
-			"\"due\": \"2014-08-30T20:00:00.000001+00:00\","
-			"\"completed\": \"2014-08-30T20:10:05.000001+00:00\","
+			"\"due\": \"2014-08-30T20:00:00Z\","
+			"\"completed\": \"2014-08-30T20:10:05Z\","
 			"\"deleted\": false,"
 			"\"hidden\": true,"
 			/* Unhandled for the moment: */
diff --git a/gdata/tests/youtube.c b/gdata/tests/youtube.c
index a1e070a..1195bc3 100644
--- a/gdata/tests/youtube.c
+++ b/gdata/tests/youtube.c
@@ -967,8 +967,8 @@ test_parsing_yt_recorded (void)
 				"gd:etag='W/\"CEMFSX47eCp7ImA9WxVUGEw.\"'>"
 				"<title type='text'>Judas Priest - Painkiller</title>"
 				"<id>tag:youtube.com,2008:video:JAagedeKdcQ</id>"
-				"<updated>2009-03-23T12:46:58.000001+00:00</updated>"
-				"<published>2006-05-16T14:06:37.000001+00:00</published>"
+				"<updated>2009-03-23T12:46:58Z</updated>"
+				"<published>2006-05-16T14:06:37Z</published>"
 				"<category term='http://gdata.youtube.com/schemas/2007#video' scheme='http://schemas.google.com/g/2005#kind'/>"
 				"<link href='http://www.youtube.com/watch?v=JAagedeKdcQ' rel='http://www.iana.org/assignments/relation/alternate' type='text/html'/>"
 				"<link href='http://gdata.youtube.com/feeds/api/videos/JAagedeKdcQ?client=ytapi-google-jsdemo' rel='http://www.iana.org/assignments/relation/self' type='application/atom+xml'/>"
@@ -1055,8 +1055,8 @@ test_parsing_yt_access_control (void)
 				"gd:etag='W/\"CEMFSX47eCp7ImA9WxVUGEw.\"'>"
 				"<title type='text'>Judas Priest - Painkiller</title>"
 				"<id>tag:youtube.com,2008:video:JAagedeKdcQ</id>"
-				"<updated>2009-03-23T12:46:58.000001+00:00</updated>"
-				"<published>2006-05-16T14:06:37.000001+00:00</published>"
+				"<updated>2009-03-23T12:46:58Z</updated>"
+				"<published>2006-05-16T14:06:37Z</published>"
 				"<category term='http://gdata.youtube.com/schemas/2007#video' scheme='http://schemas.google.com/g/2005#kind'/>"
 				"<link href='http://www.youtube.com/watch?v=JAagedeKdcQ' rel='http://www.iana.org/assignments/relation/alternate' type='text/html'/>"
 				"<link href='http://gdata.youtube.com/feeds/api/videos/JAagedeKdcQ?client=ytapi-google-jsdemo' rel='http://www.iana.org/assignments/relation/self' type='application/atom+xml'/>"
@@ -1255,8 +1255,8 @@ test_parsing_georss_where (void)
 		       "xmlns:gml='http://www.opengis.net/gml'>"
 			"<title type='text'>Some video somewhere</title>"
 			"<id>tag:youtube.com,2008:video:JAagedeKdcQ</id>"
-			"<updated>2009-03-23T12:46:58.000001+00:00</updated>"
-			"<published>2006-05-16T14:06:37.000001+00:00</published>"
+			"<updated>2009-03-23T12:46:58Z</updated>"
+			"<published>2006-05-16T14:06:37Z</published>"
 			"<category term='http://gdata.youtube.com/schemas/2007#video' scheme='http://schemas.google.com/g/2005#kind'/>"
 			"<link href='http://www.youtube.com/watch?v=JAagedeKdcQ' rel='http://www.iana.org/assignments/relation/alternate' type='text/html'/>"
 			"<link href='http://gdata.youtube.com/feeds/api/videos/JAagedeKdcQ?client=ytapi-google-jsdemo' rel='http://www.iana.org/assignments/relation/self' type='application/atom+xml'/>"
@@ -1295,8 +1295,8 @@ test_parsing_georss_where (void)
 		       "xmlns:gml='http://www.opengis.net/gml'>"
 			"<title type='text'>Some video somewhere</title>"
 			"<id>tag:youtube.com,2008:video:JAagedeKdcQ</id>"
-			"<updated>2009-03-23T12:46:58.000001+00:00</updated>"
-			"<published>2006-05-16T14:06:37.000001+00:00</published>"
+			"<updated>2009-03-23T12:46:58Z</updated>"
+			"<published>2006-05-16T14:06:37Z</published>"
 			"<category term='http://gdata.youtube.com/schemas/2007#video' scheme='http://schemas.google.com/g/2005#kind'/>"
 			"<link href='http://www.youtube.com/watch?v=JAagedeKdcQ' rel='http://www.iana.org/assignments/relation/alternate' type='text/html'/>"
 			"<link href='http://gdata.youtube.com/feeds/api/videos/JAagedeKdcQ?client=ytapi-google-jsdemo' rel='http://www.iana.org/assignments/relation/self' type='application/atom+xml'/>"
-- 
1.9.3

A gnu/packages/patches/libgdata-glib-duplicate-tests.patch => gnu/packages/patches/libgdata-glib-duplicate-tests.patch +16 -0
@@ 0,0 1,16 @@
diff -ur a/gdata/tests/oauth1-authorizer.c b/gdata/tests/oauth1-authorizer.c
--- a/gdata/tests/oauth1-authorizer.c	1969-12-31 19:00:00.000000000 -0500
+++ b/gdata/tests/oauth1-authorizer.c	2017-05-27 19:35:30.551725678 -0400
@@ -1045,10 +1045,10 @@
 	/* Sync request-authentication-uri tests */
 	g_test_add ("/oauth1-authorizer/request-authentication-uri/sync", OAuth1AuthorizerData, NULL, set_up_oauth1_authorizer_data,
 	            test_oauth1_authorizer_request_authentication_uri_sync, tear_down_oauth1_authorizer_data);
-	g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains", OAuth1AuthorizerData, NULL,
+	g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains1", OAuth1AuthorizerData, NULL,
 	            set_up_oauth1_authorizer_data_multiple_domains, test_oauth1_authorizer_request_authentication_uri_sync,
 	            tear_down_oauth1_authorizer_data);
-	g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains", OAuth1AuthorizerData, NULL,
+	g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains2", OAuth1AuthorizerData, NULL,
 	            set_up_oauth1_authorizer_data_locale, test_oauth1_authorizer_request_authentication_uri_sync,
 	            tear_down_oauth1_authorizer_data);
 	g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/cancellation", OAuth1AuthorizerData, NULL,

M gnu/packages/ruby.scm => gnu/packages/ruby.scm +64 -29
@@ 6,6 6,7 @@
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;


@@ 48,8 49,7 @@
(define-public ruby
  (package
    (name "ruby")
    (version "2.3.3")
    (replacement ruby-2.3.4)
    (version "2.4.0")
    (source
     (origin
       (method url-fetch)


@@ 58,7 58,7 @@
                           "/ruby-" version ".tar.xz"))
       (sha256
        (base32
         "1p0rfk0blrbfjcnv0vb0ha4hxflgkfhv9zbzp4vvld2pi31ahkqs"))
         "141nnsdk2q83c23p5kl404id8gy1ap261gin48rbjj5sbksgx1rs"))
       (modules '((guix build utils)))
       (snippet `(begin
                   ;; Remove bundled libffi


@@ 102,11 102,11 @@ a focus on simplicity and productivity.")
    (home-page "https://ruby-lang.org")
    (license license:ruby)))

(define ruby-2.3.4
(define-public ruby-2.3
  (package
    (inherit ruby)
    (name "ruby")
    (version "2.3.4")
    (replacement #f)
    (source
     (origin
       (method url-fetch)


@@ 447,13 447,13 @@ expectations and mocks frameworks.")
(define-public bundler
  (package
    (name "bundler")
    (version "1.14.6")
    (version "1.15.1")
    (source (origin
              (method url-fetch)
              (uri (rubygems-uri "bundler" version))
              (sha256
               (base32
                "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl"))))
                "1mq0n8g08vf2rnd7fvylx3f4sspx15abid49gycf9zzsjj7w8vps"))))
    (build-system ruby-build-system)
    (arguments
     '(#:tests? #f)) ; avoid dependency cycles


@@ 1199,13 1199,13 @@ use GNU gettext tools for maintenance.")
(define-public ruby-test-unit
  (package
    (name "ruby-test-unit")
    (version "3.1.5")
    (version "3.2.4")
    (source (origin
              (method url-fetch)
              (uri (rubygems-uri "test-unit" version))
              (sha256
               (base32
                "0jxznjzwmrlp8wqjxsd06qbiddffn68pdhz6nrqpjbiln1z3af4w"))))
                "09mb34lnffracsqxl4dav4c21p5nr4pj9hm5qy2s83k5hbjya3s7"))))
    (build-system ruby-build-system)
    (propagated-inputs
     `(("ruby-power-assert" ,ruby-power-assert)))


@@ 1460,16 1460,17 @@ allows mocking and stubbing of methods on real (non-mock) classes.")
(define-public ruby-net-ssh
  (package
    (name "ruby-net-ssh")
    (version "3.0.1")
    (version "4.1.0")
    (source (origin
              (method url-fetch)
              (uri (rubygems-uri "net-ssh" version))
              (sha256
               (base32
                "1dzqkgwi9xm6mbfk1rkk17rzmz8m5xakqi21w1b97ybng6kkw0hf"))))
                "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q"))))
    (build-system ruby-build-system)
    (native-inputs
     `(("ruby-mocha" ,ruby-mocha)
     `(("bundler" ,bundler)
       ("ruby-mocha" ,ruby-mocha)
       ("ruby-test-unit" ,ruby-test-unit)))
    (synopsis "Ruby implementation of the SSH2 client protocol")
    (description "@code{Net::SSH} is a pure-Ruby implementation of the SSH2


@@ 1481,13 1482,13 @@ with processes on remote servers, via SSH2.")
(define-public ruby-minitest
  (package
    (name "ruby-minitest")
    (version "5.10.1")
    (version "5.10.2")
    (source (origin
              (method url-fetch)
              (uri (rubygems-uri "minitest" version))
              (sha256
               (base32
                "1yk2m8sp0p5m1niawa3ncg157a4i0594cg7z91rzjxv963rzrwab"))))
                "11my86fnihvpndyknn3c14hc82nhsgggnhlxh8h3bdjpmfsvl0my"))))
    (build-system ruby-build-system)
    (native-inputs
     `(("ruby-hoe" ,ruby-hoe)))


@@ 1514,7 1515,13 @@ facilities supporting TDD, BDD, mocking, and benchmarking.")
          (lambda _
            (substitute* "Rakefile"
              (("self\\.rubyforge_name = .*") ""))
            #t)))))))
            #t))
         (add-after 'build 'exclude-failing-tests
           (lambda _
             ;; Some tests are failing on Ruby 2.4 due to the deprecation of
             ;; Fixnum.
             (delete-file "test/minitest/test_minitest_spec.rb")
             #t)))))))

(define-public ruby-minitest-sprint
  (package


@@ 2224,9 2231,15 @@ current line in an external editor.")
    (arguments
     `(#:phases
       (modify-phases %standard-phases
         (add-before 'check 'set-rubylib
         (add-before 'check 'set-rubylib-and-patch-gemfile
          (lambda _
            (setenv "RUBYLIB" "lib")
            (substitute* "sdoc.gemspec"
              (("s.add_runtime_dependency.*") "\n")
              (("s.add_dependency.*") "\n"))
            (substitute* "Gemfile"
              (("gem \"rake\".*")
               "gem 'rake'\ngem 'rdoc'\ngem 'json'\n"))
            #t)))))
    (propagated-inputs
     `(("ruby-json" ,ruby-json)))


@@ 2274,13 2287,13 @@ documentation for Ruby code.")
(define-public ruby-gem-hadar
  (package
    (name "ruby-gem-hadar")
    (version "1.3.1")
    (version "1.9.1")
    (source (origin
              (method url-fetch)
              (uri (rubygems-uri "gem_hadar" version))
              (sha256
               (base32
                "1j8qri4m9wf8nbfv0kakrgsv2x8vg10914xgm6f69nw8zi3i39ws"))))
                "1zxvd9l95rbks7x3cxn396w0sn7nha5542bf97v8akkn4vm7nby9"))))
    (build-system ruby-build-system)
    ;; This gem needs itself at development time. We disable rebuilding of the
    ;; gemspec to avoid this loop.


@@ 2294,9 2307,7 @@ documentation for Ruby code.")
    (propagated-inputs
     `(("git" ,git)
       ("ruby-tins" ,ruby-tins)
       ("ruby-sdoc" ,ruby-sdoc)))
    (native-inputs
     `(("bundler" ,bundler)))
       ("ruby-yard" ,ruby-yard)))
    (synopsis "Library for the development of Ruby gems")
    (description
     "This library contains some useful functionality to support the


@@ 2437,14 2448,14 @@ when working with Ruby code.")
(define-public ruby-json
  (package
    (name "ruby-json")
    (version "1.8.3")
    (version "2.1.0")
    (source
     (origin
       (method url-fetch)
       (uri (rubygems-uri "json" version))
       (sha256
        (base32
         "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"))))
         "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"))))
    (build-system ruby-build-system)
    (arguments '(#:tests? #f)) ; dependency cycle with sdoc
    (synopsis "JSON library for Ruby")


@@ 2697,14 2708,14 @@ unacceptable HTML and/or CSS from a string.")
(define-public ruby-ox
  (package
    (name "ruby-ox")
    (version "2.2.1")
    (version "2.5.0")
    (source
     (origin
       (method url-fetch)
       (uri (rubygems-uri "ox" version))
       (sha256
        (base32
         "00i11xd4ayh7349rhgskajfxn0qzkb74ab01217zix9qcapssxax"))))
         "0rar0xr5qn3zac1r2z18kmpapx121c2l3z8jsgh60vsddwzpdh7h"))))
    (build-system ruby-build-system)
    (arguments
     '(#:tests? #f)) ; no tests


@@ 2759,14 2770,14 @@ alternative to Marshal for Object serialization. ")
(define-public ruby-pg
  (package
    (name "ruby-pg")
    (version "0.18.2")
    (version "0.20.0")
    (source
     (origin
       (method url-fetch)
       (uri (rubygems-uri "pg" version))
       (sha256
        (base32
         "1axxbf6ij1iqi3i1r3asvjc80b0py5bz0m2wy5kdi5xkrpr82kpf"))))
         "03xcgwjs6faxis81jxf2plnlalg55dhhafqv3kvjxfr8ic7plpw5"))))
    (build-system ruby-build-system)
    (arguments
     '(#:test-target "spec"))


@@ 3576,7 3587,19 @@ It has built-in support for the legacy @code{cookies.txt} and
         ;; be require'd.
         (replace 'check
           (lambda _
             (zero? (system* "ruby" "-Ilib" "-r" "ansi")))))))
             (zero? (system* "ruby" "-Ilib" "-r" "ansi"))))
         (add-before 'validate-runpath 'replace-broken-symlink
           (lambda* (#:key outputs #:allow-other-keys)
             (let* ((out (assoc-ref outputs "out"))
                    (file (string-append out "/lib/ruby/gems/"
                                         ,(package-version ruby)
                                         "/gems/ansi-" ,version
                                         "/lib/ansi.yml")))
               ;; XXX: This symlink is broken since ruby 2.4.
               ;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html
               (delete-file file)
               (symlink "../.index" file)
               #t))))))
    (synopsis "ANSI escape code related libraries")
    (description
     "This package is a collection of ANSI escape code related libraries


@@ 3765,7 3788,19 @@ requirement specifications systems like Cucumber.")
     `(#:phases
       (modify-phases %standard-phases
         (replace 'check
           (lambda _ (zero? (system* "qed")))))))
           (lambda _ (zero? (system* "qed"))))
         (add-before 'validate-runpath 'replace-broken-symlink
           (lambda* (#:key outputs #:allow-other-keys)
             (let* ((out (assoc-ref outputs "out"))
                    (file (string-append out "/lib/ruby/gems/"
                                         ,(package-version ruby)
                                         "/gems/ae-" ,version
                                         "/lib/ae.yml")))
               ;; XXX: This symlink is broken since ruby 2.4.
               ;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html
               (delete-file file)
               (symlink "../.index" file)
               #t))))))
    (propagated-inputs
     `(("ruby-ansi" ,ruby-ansi)))
    (native-inputs

M gnu/packages/video.scm => gnu/packages/video.scm +2 -2
@@ 411,7 411,7 @@ SMPTE 314M.")
(define-public libva
  (package
    (name "libva")
    (version "1.8.1")
    (version "1.8.2")
    (source
     (origin
       (method url-fetch)


@@ 419,7 419,7 @@ SMPTE 314M.")
             "https://www.freedesktop.org/software/vaapi/releases/libva/libva-"
             version".tar.bz2"))
       (sha256
        (base32 "0wswfznj93jpnxhc3jwdk5j3pmyki0rs6k9vk4vnzds0dddximf1"))))
        (base32 "1pnfl3q7dzxs26l3jk9xi97gr0qwnaz6dhvf9ifp2yplr3fy7lwy"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)))

M gnu/packages/web.scm => gnu/packages/web.scm +30 -0
@@ 19,6 19,7 @@
;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Kei Kebreau <kei@openmailbox.org>
;;;
;;; This file is part of GNU Guix.
;;;


@@ 68,6 69,7 @@
  #:use-module (gnu packages gnome)
  #:use-module (gnu packages gnu-doc)
  #:use-module (gnu packages gnupg)
  #:use-module (gnu packages gnuzilla)
  #:use-module (gnu packages gperf)
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages icu4c)


@@ 708,6 710,34 @@ modifying pages and incoming and outgoing headers, monitoring pages for
changes, and much more.")
    (license l:gpl2+)))

(define-public liboauth
  (package
    (name "liboauth")
    (version "1.0.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://sourceforge/liboauth/liboauth-"
                                  version ".tar.gz"))
              (sha256
               (base32
                "07w1aq8y8wld43wmbk2q8134p3bfkp2vma78mmsfgw2jn1bh3xhd"))))
    (build-system gnu-build-system)
    (arguments '(#:configure-flags '("--enable-nss")))
    (native-inputs `(("pkg-config" ,pkg-config)))
    (propagated-inputs
     `(("curl" ,curl)
       ("nss" ,nss)))
    (home-page "https://sourceforge.net/projects/liboauth")
    (synopsis "C library implementing the http://oauth.net API")
    (description
     "liboauth is a collection of C functions implementing the http://oauth.net
API.  liboauth provides functions to escape and encode stings according to
OAuth specifications and offers high-level functionality built on top to sign
requests or verify signatures using either NSS or OpenSSL for calculating the
hash/signatures.")
    ;; Source code may be distributed under either license.
    (license (list l:expat l:gpl2+))))

(define-public libyaml
  (package
    (name "libyaml")

M gnu/packages/xorg.scm => gnu/packages/xorg.scm +2 -2
@@ 3623,7 3623,7 @@ alternative implementations like XRandR or TwinView.")
(define xkbcomp-intermediate ; used as input for xkeyboard-config
  (package
    (name "xkbcomp-intermediate")
    (version "1.3.1")
    (version "1.4.0")
    (source
      (origin
        (method url-fetch)


@@ 3633,7 3633,7 @@ alternative implementations like XRandR or TwinView.")
               ".tar.bz2"))
        (sha256
         (base32
          "0gcjy70ppmcl610z8gxc7sydsx93f8cm8pggm4qhihaa1ngdq103"))))
          "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto)