diff options
| author | Marius Bakke <marius@gnu.org> | 2022-07-21 23:52:47 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-07-21 23:52:47 +0200 |
| commit | abea091dbef2d44e6eb46bd2413bdf917e14d095 (patch) | |
| tree | 28f6c61dbda0acb52678944b121b66a6f50a3709 /gnu/local.mk | |
| parent | 3b20467807c32aeac56bbbe22ffb8823f68e282b (diff) | |
| parent | 3f171587bc6a47bb056f3e699e17e05f5832aea5 (diff) | |
| download | guix-abea091dbef2d44e6eb46bd2413bdf917e14d095.tar guix-abea091dbef2d44e6eb46bd2413bdf917e14d095.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 6baae4fa8d..2bcf966101 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -17,7 +17,7 @@ # Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com> # Copyright © 2017, 2018, 2019 Gábor Boskovits <boskovits@gmail.com> # Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net> -# Copyright © 2018, 2019, 2020, 2021 Oleg Pykhalov <go.wigust@gmail.com> +# Copyright © 2018, 2019, 2020, 2021, 2022 Oleg Pykhalov <go.wigust@gmail.com> # Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com> # Copyright © 2018, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> # Copyright © 2019, 2020, 2021, 2022 Guillaume Le Vaillant <glv@posteo.net> @@ -967,6 +967,7 @@ dist_patch_DATA = \ %D%/packages/patches/cmh-support-fplll.patch \ %D%/packages/patches/coda-use-system-libs.patch \ %D%/packages/patches/collectd-5.11.0-noinstallvar.patch \ + %D%/packages/patches/containerd-create-pid-file.patch \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ %D%/packages/patches/cool-retro-term-wctype.patch \ @@ -1390,7 +1391,6 @@ dist_patch_DATA = \ %D%/packages/patches/libcroco-CVE-2020-12825.patch \ %D%/packages/patches/libcyaml-libyaml-compat.patch \ %D%/packages/patches/libexpected-nofetch.patch \ - %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnomeui-utf8.patch \ |