diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-07-30 18:08:28 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-07-30 18:08:28 +0200 |
| commit | 869250809bddcf8eab26ecdedabad6fc060751dd (patch) | |
| tree | 2108049faa07fd2b79d679799fa51ce8a2e5612a /gnu/local.mk | |
| parent | f419abea22fe5dd3aa96c19990316e502157350b (diff) | |
| parent | f475b90c353deff5b848753bf88c855f481f1ec0 (diff) | |
| download | gnu-guix-869250809bddcf8eab26ecdedabad6fc060751dd.tar gnu-guix-869250809bddcf8eab26ecdedabad6fc060751dd.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index c8b42d1de1..9ae23d1a23 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -880,6 +880,7 @@ dist_patch_DATA = \ %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ %D%/packages/patches/libreoffice-icu.patch \ + %D%/packages/patches/libreoffice-glm.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ @@ -1062,7 +1063,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ - %D%/packages/patches/python-dendropy-fix-tests.patch \ %D%/packages/patches/python-fix-tests.patch \ %D%/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch \ %D%/packages/patches/python-genshi-buildable-on-python-2.7.patch \ |