[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: Merge branch 'master' into staging
|
From: |
Marius Bakke |
|
Subject: |
03/03: Merge branch 'master' into staging |
|
Date: |
Tue, 19 Jun 2018 11:04:22 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 0106d6b40dc0b8f1c81326e633bfa5134a446a9c
Merge: 7e66e0b 793a66e
Author: Marius Bakke <address@hidden>
Date: Tue Jun 19 17:02:16 2018 +0200
Merge branch 'master' into staging
build-aux/build-self.scm | 53 +-
configure.ac | 9 +-
gnu/local.mk | 5 +
gnu/packages/audio.scm | 4 +-
gnu/packages/backup.scm | 4 +-
gnu/packages/databases.scm | 4 +-
gnu/packages/elf.scm | 4 +-
gnu/packages/emacs.scm | 45 +-
gnu/packages/gnu-pw-mgr.scm | 14 +-
gnu/packages/mail.scm | 4 +-
gnu/packages/music.scm | 6 +-
gnu/packages/package-management.scm | 15 +-
.../patches/openssl-1.0.2-CVE-2018-0495.patch | 215 +
.../patches/openssl-1.0.2-CVE-2018-0732.patch | 50 +
.../patches/openssl-1.1.0-CVE-2018-0495.patch | 152 +
.../patches/openssl-1.1.0-CVE-2018-0732.patch | 50 +
gnu/packages/patches/qemu-CVE-2018-11806.patch | 105 +
gnu/packages/tls.scm | 14 +-
gnu/packages/virtualization.scm | 1 +
gnu/packages/w3m.scm | 5 +-
gnu/packages/xorg.scm | 8 +-
gnu/system.scm | 6 +-
guix/build/compile.scm | 14 +
guix/build/waf-build-system.scm | 5 +-
guix/config.scm.in | 4 -
guix/import/snix.scm | 4 +-
guix/self.scm | 58 +-
po/guix/da.po | 56 +-
po/packages/da.po | 12123 +++++++++++++------
29 files changed, 9233 insertions(+), 3804 deletions(-)