diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-10-18 18:10:47 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-18 18:10:47 +0200 |
| commit | b95d1b3289a6bb8e346a47e750660e16fb201c57 (patch) | |
| tree | cd4d956436f21d77645fd795d3e9737e4892c1d3 /gnu/local.mk | |
| parent | a1d1703a1dc6bfcd10f48fe707ee7ac65300a37d (diff) | |
| parent | dabcfc6de29032ea52d1cb54163a783f7e480167 (diff) | |
| download | guix-b95d1b3289a6bb8e346a47e750660e16fb201c57.tar guix-b95d1b3289a6bb8e346a47e750660e16fb201c57.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 287ba10f7b..f3712d8920 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -794,6 +794,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ + %D%/packages/patches/emacs-magit-log-format-author-margin.patch \ %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/emacs-undohist-ignored.patch \ @@ -1132,6 +1133,9 @@ dist_patch_DATA = \ %D%/packages/patches/mtools-mformat-uninitialized.patch \ %D%/packages/patches/mumble-1.2.19-abs.patch \ %D%/packages/patches/mumps-build-parallelism.patch \ + %D%/packages/patches/mumps-shared-libseq.patch \ + %D%/packages/patches/mumps-shared-mumps.patch \ + %D%/packages/patches/mumps-shared-pord.patch \ %D%/packages/patches/mupen64plus-ui-console-notice.patch \ %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \ %D%/packages/patches/mutt-store-references.patch \ @@ -1298,8 +1302,6 @@ dist_patch_DATA = \ %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/racket-store-checksum-override.patch \ %D%/packages/patches/ruby-rubygems-276-for-ruby24.patch \ - %D%/packages/patches/ruby-concurrent-ignore-broken-test.patch \ - %D%/packages/patches/ruby-concurrent-test-arm.patch \ %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ %D%/packages/patches/ruby-safe-yaml-add-require-time.patch \ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ |