guix-commits
[Top][All Lists]
Advanced

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

01/01: Merge branch 'master' into gnome-updates


From: Mark H. Weaver
Subject: 01/01: Merge branch 'master' into gnome-updates
Date: Sat, 14 Jan 2017 10:25:02 +0000 (UTC)

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

commit 5827ea30ee64f2981929f865cf4c07e6c4712773
Merge: 57203eb dd42a33
Author: Mark H Weaver <address@hidden>
Date:   Sat Jan 14 05:24:09 2017 -0500

    Merge branch 'master' into gnome-updates

 .gitignore                          |    1 +
 configure.ac                        |    5 +
 doc/contributing.texi               |   28 ++-
 doc/guix.texi                       |   29 +++
 doc/local.mk                        |    3 +-
 etc/indent-code.el.in               |   62 ++++++
 gnu/packages/abiword.scm            |    9 +-
 gnu/packages/admin.scm              |    4 +-
 gnu/packages/audacity.scm           |   14 +-
 gnu/packages/bioinformatics.scm     |   61 +++++
 gnu/packages/dns.scm                |    4 +-
 gnu/packages/freedesktop.scm        |   12 +
 gnu/packages/gimp.scm               |    3 +-
 gnu/packages/gnucash.scm            |    2 +-
 gnu/packages/haskell.scm            |   37 ++-
 gnu/packages/linux.scm              |   35 ++-
 gnu/packages/nano.scm               |    4 +-
 gnu/packages/package-management.scm |    8 +-
 gnu/packages/perl.scm               |   25 +++
 gnu/packages/python.scm             |   46 +++-
 gnu/packages/qt.scm                 |  233 ++++++++++++++++++-
 gnu/packages/shells.scm             |    4 +-
 gnu/packages/statistics.scm         |   25 +++
 gnu/packages/suckless.scm           |  420 ++++++++++++++++++++++++++++++++++-
 gnu/packages/upnp.scm               |   11 +-
 gnu/packages/vpn.scm                |    5 +-
 gnu/packages/xfig.scm               |  155 +++++++------
 gnu/packages/xorg.scm               |  127 ++++++++---
 gnu/services/databases.scm          |   81 ++++++-
 guix/derivations.scm                |   17 +-
 guix/git-download.scm               |    3 +-
 guix/http-client.scm                |   26 ++-
 guix/import/github.scm              |   17 +-
 guix/licenses.scm                   |   10 +-
 guix/scripts/challenge.scm          |  185 +++++++++------
 guix/scripts/perform-download.scm   |   24 +-
 guix/ui.scm                         |   52 ++---
 tests/challenge.scm                 |   62 +++++-
 38 files changed, 1543 insertions(+), 306 deletions(-)




reply via email to

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