[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/04: Merge branch 'master' into core-updates
|
From: |
Marius Bakke |
|
Subject: |
03/04: Merge branch 'master' into core-updates |
|
Date: |
Sun, 9 Sep 2018 19:40:40 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit fe79ce3b1f34300ff3bb94238462323f887c93be
Merge: fb94354 d4bd245
Author: Marius Bakke <address@hidden>
Date: Mon Sep 10 01:37:32 2018 +0200
Merge branch 'master' into core-updates
gnu/local.mk | 1 +
gnu/packages/bioconductor.scm | 4 +-
gnu/packages/bioinformatics.scm | 4 +-
gnu/packages/gd.scm | 11 ++
gnu/packages/patches/gd-CVE-2018-1000222.patch | 87 +++++++++++++
gnu/packages/php.scm | 3 +-
gnu/packages/statistics.scm | 4 +-
gnu/packages/tex.scm | 8 +-
gnu/packages/tls.scm | 8 +-
guix/scripts/build.scm | 2 +-
guix/scripts/package.scm | 39 +++---
guix/ui.scm | 162 ++++++++++++++++++++++++-
12 files changed, 300 insertions(+), 33 deletions(-)