diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-05-01 15:03:30 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-01 15:03:30 +0200 |
| commit | bf4af30bb2bce9dd5baf91f313ea35c55893eb10 (patch) | |
| tree | 94aa42278cd88cb50304e7fe34854399fc5255af /gnu-system.am | |
| parent | 9e63a388d91f73e2b82f8c4688f131680fe5f165 (diff) | |
| parent | bc7d089a9cb5ce843730f863cc03195168a956b9 (diff) | |
| download | guix-bf4af30bb2bce9dd5baf91f313ea35c55893eb10.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu-system.am b/gnu-system.am index 2692394519..26228fccfa 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -175,6 +175,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/libftdi.scm \ gnu/packages/libidn.scm \ gnu/packages/libphidget.scm \ + gnu/packages/libreoffice.scm \ gnu/packages/libsigsegv.scm \ gnu/packages/libunistring.scm \ gnu/packages/libusb.scm \ @@ -440,8 +441,6 @@ dist_patch_DATA = \ gnu/packages/patches/grep-CVE-2015-1345.patch \ gnu/packages/patches/grub-gets-undeclared.patch \ gnu/packages/patches/grub-freetype.patch \ - gnu/packages/patches/gstreamer-0.10-bison3.patch \ - gnu/packages/patches/gstreamer-0.10-silly-test.patch \ gnu/packages/patches/guile-1.8-cpp-4.5.patch \ gnu/packages/patches/guile-arm-fixes.patch \ gnu/packages/patches/guile-default-utf8.patch \ |