diff options
| author | Andreas Enge <andreas@enge.fr> | 2015-04-26 20:08:49 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2015-04-26 20:08:49 +0200 |
| commit | 4ac0d6444d4edf38edc7c07331cf76deb4a506bc (patch) | |
| tree | 5264c9c87172b8f0015823b0ee891d3672ac291a /gnu-system.am | |
| parent | d074e2f99130782e8eb7fa44c79c01db6c86f77d (diff) | |
| parent | 7bde30e18de3e8cd7e4156ea5bb0d9439b6c12d7 (diff) | |
| download | guix-4ac0d6444d4edf38edc7c07331cf76deb4a506bc.tar.gz | |
Merge branch 'master' into core-updates.
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gnu-system.am b/gnu-system.am index 8936b0be1f..820e1e1e79 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -422,6 +422,7 @@ dist_patch_DATA = \ gnu/packages/patches/gcc-cross-environment-variables.patch \ gnu/packages/patches/geoclue-config.patch \ gnu/packages/patches/ghostscript-runpath.patch \ + gnu/packages/patches/gitolite-openssh-6.8-compat.patch \ gnu/packages/patches/glib-tests-desktop.patch \ gnu/packages/patches/glib-tests-homedir.patch \ gnu/packages/patches/glib-tests-prlimit.patch \ @@ -515,6 +516,7 @@ dist_patch_DATA = \ gnu/packages/patches/procps-make-3.82.patch \ gnu/packages/patches/pulseaudio-fix-mult-test.patch \ gnu/packages/patches/pulseaudio-longer-test-timeout.patch \ + gnu/packages/patches/pycairo-wscript.patch \ gnu/packages/patches/pybugz-encode-error.patch \ gnu/packages/patches/pybugz-stty.patch \ gnu/packages/patches/pyqt-configure.patch \ @@ -555,6 +557,7 @@ dist_patch_DATA = \ gnu/packages/patches/weex-vacopy.patch \ gnu/packages/patches/wicd-urwid-1.3.patch \ gnu/packages/patches/wmctrl-64-fix.patch \ + gnu/packages/patches/wpa-supplicant-CVE-2015-1863.patch \ gnu/packages/patches/xf86-video-ark-remove-mibstore.patch \ gnu/packages/patches/xf86-video-ast-remove-mibstore.patch \ gnu/packages/patches/xf86-video-geode-glibc-2.20.patch \ |