diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-12-12 09:02:49 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-12-12 09:02:49 -0500 |
| commit | f184be73defd62f46a14dbdb96df3fa61806f3be (patch) | |
| tree | 842b127645c7a3f5ef6383262a3358a3340e4cda /gnu/local.mk | |
| parent | c9974889ef69fbe6199a9bb1cb2fa5a594130114 (diff) | |
| parent | 94e9651241b3e827531779717952d386535801f3 (diff) | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 777c069de79..7991f0e2e57 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -116,6 +116,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/anthy.scm \ %D%/packages/antivirus.scm \ %D%/packages/apl.scm \ + %D%/packages/apparmor.scm \ %D%/packages/apr.scm \ %D%/packages/arcan.scm \ %D%/packages/aspell.scm \ @@ -759,6 +760,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests/docker.scm \ %D%/tests/file-sharing.scm \ %D%/tests/ganeti.scm \ + %D%/tests/gdm.scm \ %D%/tests/guix.scm \ %D%/tests/monitoring.scm \ %D%/tests/nfs.scm \ @@ -1346,6 +1348,7 @@ dist_patch_DATA = \ %D%/packages/patches/jami-fix-unit-tests-build.patch \ %D%/packages/patches/jami-libjami-headers-search.patch \ %D%/packages/patches/jami-no-webengine.patch \ + %D%/packages/patches/jami-sipaccount-segfault.patch \ %D%/packages/patches/jami-sip-contacts.patch \ %D%/packages/patches/jami-sip-unregister.patch \ %D%/packages/patches/jami-xcb-link.patch \ @@ -1375,7 +1378,6 @@ dist_patch_DATA = \ %D%/packages/patches/jsoncpp-pkg-config-version.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/julia-tracker-16-compat.patch \ - %D%/packages/patches/julia-allow-parallel-build.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ @@ -1465,7 +1467,6 @@ dist_patch_DATA = \ %D%/packages/patches/libtirpc-hurd.patch \ %D%/packages/patches/libtommath-fix-linkage.patch \ %D%/packages/patches/libtool-skip-tests2.patch \ - %D%/packages/patches/libunwind-julia-fix-GCC10-fno-common.patch \ %D%/packages/patches/libusb-0.1-disable-tests.patch \ %D%/packages/patches/libusb-for-axoloti.patch \ %D%/packages/patches/libutils-add-includes.patch \ @@ -1758,8 +1759,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-robotframework-atest.patch \ %D%/packages/patches/python-robotframework-source-date-epoch.patch \ %D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \ - %D%/packages/patches/python-seaborn-kde-test.patch \ - %D%/packages/patches/python-seaborn-2690.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-versioneer-guix-support.patch \ |