diff options
| author | Marius Bakke <marius@gnu.org> | 2023-01-03 15:38:13 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2023-01-03 15:38:13 +0100 |
| commit | 9123bb0fba3fce976dc41cd3b8919ee73b4cee4d (patch) | |
| tree | 50ba63a4a3a6ffeb2f37fd0929813b51e00d01dc /gnu/local.mk | |
| parent | ec0fbb471dfc6f72796da9ebafbb0630daa91267 (diff) | |
| parent | 71ee1fbbed8ea9788dd48a634653d66606d372ce (diff) | |
| download | guix-9123bb0fba3fce976dc41cd3b8919ee73b4cee4d.tar guix-9123bb0fba3fce976dc41cd3b8919ee73b4cee4d.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 a9b823eec3..f73f8f8423 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1399,9 +1399,7 @@ dist_patch_DATA = \ %D%/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch \ %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch \ %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \ - %D%/packages/patches/kodi-increase-test-timeout.patch \ %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \ - %D%/packages/patches/kodi-skip-test-449.patch \ %D%/packages/patches/kwayland-skip-flaky-test.patch \ %D%/packages/patches/laby-make-install.patch \ %D%/packages/patches/ldns-drill-examples.patch \ @@ -1916,6 +1914,10 @@ dist_patch_DATA = \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ + %D%/packages/patches/u-boot-infodocs-target.patch \ + %D%/packages/patches/u-boot-patman-fix-help.patch \ + %D%/packages/patches/u-boot-patman-get-maintainer.patch \ + %D%/packages/patches/u-boot-patman-local-conf.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ %D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \ |