guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Merge branch 'master' into staging


From: guix-commits
Subject: 01/01: Merge branch 'master' into staging
Date: Tue, 2 Jul 2019 14:16:35 -0400 (EDT)

mbakke pushed a commit to branch staging
in repository guix.

commit 30484be05d9e318e89e12f40a55c65766cec700a
Merge: b8d41cf 2e03bbe
Author: Marius Bakke <address@hidden>
Date:   Tue Jul 2 20:14:23 2019 +0200

    Merge branch 'master' into staging

 etc/guix-install.sh                                |   2 +-
 gnu/local.mk                                       |   1 -
 gnu/packages/algebra.scm                           |   4 +-
 gnu/packages/audio.scm                             |   4 +-
 gnu/packages/check.scm                             |   3 +-
 gnu/packages/chromium.scm                          |   6 +-
 gnu/packages/emacs-xyz.scm                         |  36 +-
 gnu/packages/finance.scm                           |   8 +-
 gnu/packages/gtk.scm                               |   2 +-
 gnu/packages/guile-xyz.scm                         | 119 +++---
 gnu/packages/guile.scm                             |   6 +-
 gnu/packages/haskell-check.scm                     |  44 +++
 gnu/packages/haskell.scm                           | 140 +++++++-
 gnu/packages/icu4c.scm                             |  18 +
 gnu/packages/image-viewers.scm                     |  26 ++
 gnu/packages/linux.scm                             |   4 +-
 gnu/packages/lisp.scm                              |  39 ++
 gnu/packages/maths.scm                             |  30 +-
 gnu/packages/package-management.scm                |  21 +-
 .../patches/webkitgtk-sans-gstreamer-gl.patch      |  24 --
 gnu/packages/regex.scm                             |   4 +-
 gnu/packages/tls.scm                               |   4 +-
 gnu/packages/upnp.scm                              |   4 +-
 gnu/packages/webkit.scm                            |   5 +-
 gnu/services/databases.scm                         |   7 +-
 guix/build-system/python.scm                       |   2 +-
 guix/derivations.scm                               |   4 +-
 guix/grafts.scm                                    |  24 +-
 guix/import/crate.scm                              |   4 +-
 guix/import/pypi.scm                               | 397 +++++++++++++--------
 tests/crate.scm                                    |   2 +-
 tests/pypi.scm                                     | 214 ++++++++---
 32 files changed, 849 insertions(+), 359 deletions(-)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]