[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: |
Thu, 8 Aug 2019 12:15:53 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 36f400f6166af069d0e17cc486fb800bbe947131
Merge: c8f5827 ffc4869
Author: Marius Bakke <address@hidden>
Date: Thu Aug 8 18:14:45 2019 +0200
Merge branch 'master' into staging
gnu/local.mk | 1 +
gnu/packages/agda.scm | 2 -
gnu/packages/bioinformatics.scm | 178 ++++++++++++++-
gnu/packages/cran.scm | 10 +-
gnu/packages/databases.scm | 8 +-
gnu/packages/freedesktop.scm | 6 +-
gnu/packages/games.scm | 4 +
gnu/packages/gnome.scm | 51 +++++
gnu/packages/haskell-apps.scm | 5 -
gnu/packages/haskell-check.scm | 9 +-
gnu/packages/haskell-crypto.scm | 66 +++++-
gnu/packages/haskell-web.scm | 248 +++++++++++++++------
gnu/packages/haskell-xyz.scm | 276 ++++++++++++++++++++++++
gnu/packages/haskell.scm | 465 +++++++++-------------------------------
gnu/packages/idris.scm | 1 -
gnu/packages/photo.scm | 4 +-
gnu/packages/ruby.scm | 6 +-
gnu/packages/statistics.scm | 15 +-
gnu/packages/wm.scm | 2 -
guix/import/hackage.scm | 8 +-
20 files changed, 887 insertions(+), 478 deletions(-)