[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: Merge branch 'master' into core-updates
|
From: |
Ludovic Courtès |
|
Subject: |
01/05: Merge branch 'master' into core-updates |
|
Date: |
Thu, 26 Jul 2018 18:20:11 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit ac46a1c8e465df81d661632a273d07443aefa24e
Merge: 3b92441 92526ad
Author: Ludovic Courtès <address@hidden>
Date: Thu Jul 26 18:15:13 2018 +0200
Merge branch 'master' into core-updates
doc/guix.texi | 8 +-
gnu/local.mk | 3 +-
gnu/packages/admin.scm | 49 ++--
gnu/packages/bioinformatics.scm | 7 +-
gnu/packages/bootloaders.scm | 13 +-
gnu/packages/compression.scm | 26 +-
gnu/packages/cups.scm | 19 +-
gnu/packages/dictionaries.scm | 3 +-
gnu/packages/display-managers.scm | 1 -
gnu/packages/image.scm | 5 +-
gnu/packages/irc.scm | 1 -
gnu/packages/java.scm | 46 +++-
gnu/packages/linux.scm | 20 +-
gnu/packages/maven.scm | 2 +-
gnu/packages/patches/pyqt-public-sip.patch | 55 ++++
gnu/packages/patches/quassel-qt-5.11.patch | 72 -----
gnu/packages/patches/syncthing-fix-crash.patch | 72 -----
gnu/packages/pdf.scm | 37 ---
gnu/packages/qt.scm | 353 ++++++++++++++++---------
gnu/packages/ruby.scm | 74 ++++++
gnu/packages/scanner.scm | 3 +-
gnu/packages/sync.scm | 36 +--
gnu/packages/syncthing.scm | 18 +-
gnu/packages/web.scm | 28 +-
gnu/packages/xml.scm | 9 -
guix/build/ruby-build-system.scm | 3 +-
26 files changed, 554 insertions(+), 409 deletions(-)