[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/04: Merge branch 'master' into core-updates
|
From: |
Ludovic Courtès |
|
Subject: |
04/04: Merge branch 'master' into core-updates |
|
Date: |
Thu, 09 Apr 2015 19:11:22 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit ee5408576d9a3d4cec24682bb76921d2d4839470
Merge: afd4079 0cc0095
Author: Ludovic Courtès <address@hidden>
Date: Thu Apr 9 21:10:46 2015 +0200
Merge branch 'master' into core-updates
configure.ac | 3 +
doc/guix.texi | 47 ++-
gnu-system.am | 1 +
gnu/build/activation.scm | 49 ++-
gnu/packages/admin.scm | 10 +-
gnu/packages/gnome.scm | 48 ++
gnu/packages/haskell.scm | 648 ++++++++++++++++++++++-
gnu/packages/package-management.scm | 7 +-
gnu/packages/patches/inetutils-syslogd.patch | 20 +
guix/build/haskell-build-system.scm | 44 +-
guix/http-client.scm | 41 ++
guix/import/hackage.scm | 767 ++++++++++++++++++++++++++
guix/profiles.scm | 60 ++-
guix/scripts/import.scm | 2 +-
guix/scripts/import/hackage.scm | 106 ++++
guix/scripts/package.scm | 1 +
po/guix/POTFILES.in | 1 +
tests/guix-package-net.sh | 8 +
tests/hackage.scm | 134 +++++
tests/packages.scm | 1 +
tests/profiles.scm | 2 +
21 files changed, 1962 insertions(+), 38 deletions(-)