diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-26 23:59:28 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-26 23:59:28 +0100 |
| commit | 24c86ad0c05bac966c3f5f3c5f40c6b0945adf09 (patch) | |
| tree | 45160aa4ebe3651a79b5abd76dcefaf8813aa966 /gnu/local.mk | |
| parent | bff94a5a537c2c484f9f6e98cab75195c3dde9e7 (diff) | |
| parent | 4a914de930a8317cab5bc11bdb608e3a3da3d1ad (diff) | |
| download | guix-24c86ad0c05bac966c3f5f3c5f40c6b0945adf09.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 7717793984..2e802680f8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1409,6 +1409,7 @@ dist_patch_DATA = \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ + %D%/packages/patches/openssh-fix-ssh-copy-id.patch \ %D%/packages/patches/openssh-hurd.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \ %D%/packages/patches/openscad-parser-boost-1.72.patch \ @@ -1507,7 +1508,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-3.8-fix-tests.patch \ %D%/packages/patches/python-CVE-2018-14647.patch \ - %D%/packages/patches/python-aiohttp-3.6.2-no-warning-fail.patch \ %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ |