diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-22 23:36:09 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-22 23:36:09 +0100 |
| commit | a485a98ca8296d760251e9d870583117ac50979e (patch) | |
| tree | 792df6983c0e52403a6c3b82c804f295369a9b1d /gnu/local.mk | |
| parent | 84d1b500f078b619daba35864c703890bd91e5c2 (diff) | |
| parent | 1ca0c348674dd4dec2ccb5a2d79b4cfd03a631ef (diff) | |
| download | guix-a485a98ca8296d760251e9d870583117ac50979e.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 42a0e09e47..49d7ea93b3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -652,6 +652,7 @@ GNU_SYSTEM_MODULES = \ \ %D%/system/images/hurd.scm \ %D%/system/images/pine64.scm \ + %D%/system/images/pinebook-pro.scm \ \ %D%/machine.scm \ \ @@ -989,6 +990,7 @@ dist_patch_DATA = \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ + %D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \ %D%/packages/patches/ganeti-deterministic-manual.patch \ %D%/packages/patches/ganeti-disable-version-symlinks.patch \ %D%/packages/patches/ganeti-drbd-compat.patch \ @@ -1717,7 +1719,6 @@ dist_patch_DATA = \ %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \ %D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch \ %D%/packages/patches/xpra-4.0.1-systemd-run.patch \ - %D%/packages/patches/xpra-4.0.4-norequests.patch \ %D%/packages/patches/xsane-fix-memory-leak.patch \ %D%/packages/patches/xsane-fix-pdf-floats.patch \ %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \ |