diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
| commit | 933204e5b1473a54367aef1f90de22424e9074ab (patch) | |
| tree | d0ccfee2b903c5fac827bc4a52ec7de17bdc1e7b /gnu-system.am | |
| parent | 9128e323c0a23243c3f70b1716c68ad0b241f30d (diff) | |
| parent | 5e25ebe2fa70297d094fe891b81c4970e45a906a (diff) | |
| download | guix-patches-933204e5b1473a54367aef1f90de22424e9074ab.tar guix-patches-933204e5b1473a54367aef1f90de22424e9074ab.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
gnu/packages/gstreamer.scm
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am index 0e23175415..a3ad603ab5 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -410,6 +410,7 @@ dist_patch_DATA = \ gnu/packages/patches/duplicity-piped-password.patch \ gnu/packages/patches/duplicity-test_selection-tmp.patch \ gnu/packages/patches/elfutils-tests-ptrace.patch \ + gnu/packages/patches/emacs-exec-path.patch \ gnu/packages/patches/eudev-rules-directory.patch \ gnu/packages/patches/findutils-absolute-paths.patch \ gnu/packages/patches/flashrom-use-libftdi1.patch \ @@ -466,7 +467,6 @@ dist_patch_DATA = \ gnu/packages/patches/libvpx-fix-ssse3-quantize.patch \ gnu/packages/patches/libvpx-vp9-out-of-bounds-access.patch \ gnu/packages/patches/linux-libre-libreboot-fix.patch \ - gnu/packages/patches/linux-libre-vblank-fix.patch \ gnu/packages/patches/lirc-localstatedir.patch \ gnu/packages/patches/lm-sensors-hwmon-attrs.patch \ gnu/packages/patches/lua51-liblua-so.patch \ |