mhw pushed a commit to branch core-updates
in repository guix.

commit cc294bcee6bfaa4524ac43450e41f083539f9cb1
Merge: 32b7506 ae7f246
Author: Mark H Weaver <m...@netris.org>
Date:   Wed Aug 9 17:25:31 2017 -0400

    Merge branch 'master' into core-updates

 gnu/local.mk                                       |   2 +-
 gnu/packages/admin.scm                             |  48 +++----
 gnu/packages/aspell.scm                            |   5 +-
 gnu/packages/bioinformatics.scm                    |   8 +-
 gnu/packages/check.scm                             |   2 +
 gnu/packages/debug.scm                             |  36 +++---
 gnu/packages/fonts.scm                             |   2 +-
 gnu/packages/game-development.scm                  |  41 ++++++
 gnu/packages/games.scm                             |   8 +-
 gnu/packages/gimp.scm                              |  39 +++---
 gnu/packages/glib.scm                              |   2 +-
 gnu/packages/gnome.scm                             |  96 +++++++-------
 gnu/packages/gnunet.scm                            |   6 +-
 gnu/packages/gnupg.scm                             |   7 +-
 gnu/packages/gnuzilla.scm                          |  90 +++++++++----
 gnu/packages/graph.scm                             | 118 +++++++++++++++++
 gnu/packages/gtk.scm                               |   4 +-
 gnu/packages/image-viewers.scm                     |  10 +-
 gnu/packages/libreoffice.scm                       |  17 ++-
 gnu/packages/linux.scm                             |  16 +--
 gnu/packages/maths.scm                             |  80 ++++++------
 gnu/packages/moreutils.scm                         |  15 +--
 .../patches/ruby-puma-ignore-broken-test.patch     |  13 --
 gnu/packages/python.scm                            |   4 +-
 gnu/packages/ruby.scm                              | 140 +++++++++++---------
 gnu/packages/statistics.scm                        | 144 ++++++++++++++++-----
 gnu/packages/virtualization.scm                    |   4 +-
 gnu/services/herd.scm                              |   9 +-
 guix/download.scm                                  |   5 +-
 29 files changed, 640 insertions(+), 331 deletions(-)

diff --cc gnu/packages/gnome.scm
index b334d7c,d7c29dc..7133a61
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -1366,18 -1373,7 +1373,18 @@@ is intended for user preferences; not a
      (native-inputs
       `(("perl" ,perl)
         ("intltool" ,intltool)))
 +    (arguments
 +     '(#:phases (modify-phases %standard-phases
 +                  (add-after 'configure 'use-our-intltool
 +                    (lambda _
 +                      ;; Do not use the bundled intltool commands, which lack
 +                      ;; the "dotless @INC" fixes of our 'intltool' package.
 +                      (substitute* (find-files "." "^Makefile$")
 +                        (("^INTLTOOL_(EXTRACT|UPDATE|MERGE) = .*$" _ tool)
 +                         (string-append "INTLTOOL_" tool " = intltool-"
 +                                        (string-downcase tool) "\n")))
 +                      #t)))))
-     (home-page "http://www.gnome.org";)
+     (home-page "https://www.gnome.org";)
      (synopsis "Base MIME and Application database for GNOME")
      (description  "GNOME Mime Data is a module which contains the base MIME
  and Application database for GNOME.  The data stored by this module is

Reply via email to