[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
From: |
guix-commits |
Subject: |
01/01: Merge branch 'master' into core-updates |
Date: |
Wed, 21 Nov 2018 18:12:02 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit ec8130eb23b79c2b8b61043f25dafcefd0daafe7
Merge: 437c78b d422cbb
Author: Marius Bakke <address@hidden>
Date: Thu Nov 22 00:10:44 2018 +0100
Merge branch 'master' into core-updates
gnu/build/linux-initrd.scm | 22 +++-
gnu/packages/build-tools.scm | 37 ++++---
gnu/packages/games.scm | 116 ++++++++++++++-------
gnu/packages/gnome.scm | 18 ++--
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/image.scm | 56 ++++++++++
.../patches/teeworlds-use-latest-wavpack.patch | 72 ++++++++++---
gnu/packages/terminals.scm | 4 +-
gnu/packages/tls.scm | 4 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/web.scm | 32 ++++++
gnu/packages/webkit.scm | 4 +-
gnu/system.scm | 11 +-
gnu/system/linux-initrd.scm | 9 +-
gnu/system/vm.scm | 2 +-
guix/scripts/system.scm | 2 +-
16 files changed, 291 insertions(+), 108 deletions(-)