[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into dbus-update
|
From: |
Mark H. Weaver |
|
Subject: |
01/02: Merge branch 'master' into dbus-update |
|
Date: |
Sat, 24 Oct 2015 03:12:21 +0000 |
mhw pushed a commit to branch dbus-update
in repository guix.
commit d3365d486636b36c95ce17deefbc169f3d4f0e9a
Merge: 6e4512c ca9745e
Author: Mark H Weaver <address@hidden>
Date: Fri Oct 23 23:11:38 2015 -0400
Merge branch 'master' into dbus-update
Makefile.am | 1 +
doc/guix.texi | 31 +-
gnu-system.am | 1 +
gnu/packages.scm | 11 +-
gnu/packages/bioinformatics.scm | 46 +
gnu/packages/cdrom.scm | 20 +
gnu/packages/compression.scm | 32 +
gnu/packages/conkeror.scm | 54 +-
gnu/packages/freeipmi.scm | 4 +-
gnu/packages/games.scm | 82 +-
gnu/packages/gnu-pw-mgr.scm | 4 +-
gnu/packages/haskell.scm | 4648 +++++++++++++++++++---
gnu/packages/less.scm | 4 +-
gnu/packages/linux.scm | 4 +-
gnu/packages/man.scm | 4 +-
gnu/packages/music.scm | 65 +
gnu/packages/ntp.scm | 4 +-
gnu/packages/patches/evilwm-lost-focus-bug.patch | 18 +
gnu/packages/python.scm | 37 +
gnu/packages/statistics.scm | 122 +-
gnu/packages/video.scm | 10 +-
gnu/packages/wm.scm | 63 +-
gnu/packages/xiph.scm | 30 +
gnu/packages/xorg.scm | 47 +-
gnu/services/xorg.scm | 4 +
guix/gnu-maintenance.scm | 253 +-
guix/http-client.scm | 2 +-
guix/import/cran.scm | 85 +-
guix/import/elpa.scm | 63 +-
guix/import/hackage.scm | 40 +-
guix/scripts/import/hackage.scm | 2 +-
guix/scripts/refresh.scm | 94 +-
guix/upstream.scm | 259 ++
po/guix/POTFILES.in | 2 +-
34 files changed, 5334 insertions(+), 812 deletions(-)