Remove stray escapes to avoid warnings from grep 3.8 which breaks expected test output. diff --git a/testsuite/tests/hsc2hs/Makefile b/testsuite/tests/hsc2hs/Makefile --- a/testsuite/tests/hsc2hs/Makefile +++ b/testsuite/tests/hsc2hs/Makefile @@ -47,5 +47,5 @@ T12504: ifeq "$(WINDOWS)" "YES" grep '{-# LINE 1 \"T12504\\\\path\\\\to\\\\$@\.hsc\" #-}' T12504/path/to/$@.hs else - grep '{-# LINE 1 \"T12504/path/to/$@\.hsc\" #-}' T12504/path/to/$@.hs + grep '{-# LINE 1 "T12504/path/to/$@\.hsc" #-}' T12504/path/to/$@.hs endif diff --git a/testsuite/tests/numeric/should_run/T7014.primops b/testsuite/tests/numeric/should_run/T7014.primops --- a/testsuite/tests/numeric/should_run/T7014.primops +++ b/testsuite/tests/numeric/should_run/T7014.primops @@ -1,8 +1,8 @@ and# or# uncheckedShift.*# -\+# -\-# ++# +-# \*# quotInt# remInt# diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile --- a/testsuite/tests/simplCore/should_compile/Makefile +++ b/testsuite/tests/simplCore/should_compile/Makefile @@ -226,7 +226,7 @@ str-rules: # g should have been collapsed into one defininition by CSE. .PHONY: T13340 T13340: - '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13340.hs -ddump-simpl -dsuppress-all | grep -c '\+#' + '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13340.hs -ddump-simpl -dsuppress-all | grep -c '+#' # We expect to see all dictionaries specialized away. href='/guix/diff/gnu/packages/kde-pim.scm?id=9834d1ab3836730cf3308603019b736d0a653013'>diff
path: root/gnu/packages/kde-pim.scm
AgeCommit message (Expand)Author
2020-08-19gnu: akonadi: Update home-page....* gnu/packages/kde-pim.scm (akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, akonadi-search)[home-page]: Update to new home-page. Efraim Flashner
2020-06-06gnu: KDE: Update to 20.04.1....* gnu/packages/patches/akonadi-paths.patch: Adjust for upstream changes. * gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/kde-internet.scm (kget, kopete, krdc, libgravatar): Update to 20.04.1. [source](uri): Adjust for new upstream location. * gnu/packages/kde-multimedia.scm (audiocd-kio, dragon, ffmpegthumbs, juk, k3b, kamoso, kmix, kwave, libkcddb, libkcompactdisc): Likewise. * gnu/packages/kde-systemtools.scm (dolphin, dolphin-plugins, khelpcenter, konsole, krfb, ksystemlog): Update to 20.04.1. [source](uri): Adjust for new upstream location. * gnu/packages/kde-utils.scm (kate, kmag, kmousetool, kmouth, sweeper): Update to 20.04.1. [source](uri): Adjust for new upstream location. * gnu/packages/kde.scm (baloo-widgets, libkomparediff2, kqtquickcharts, grantleetheme, kcachegrind, libkdegames, zeroconf-ioslave): Update to 20.04.1. [source](uri): Adjust for new upstream location. (grantleetheme)[inputs]: Add KGUIADDONS. * gnu/packages/kde-pim.scm (akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, akonadi-search, kincidenceeditor, kaddressbook, kalarmcal, kblog, kcalendarsupport, kcalutils, kdav, kdepim-apps-libs, kdepim-runtime, keventviews, kgpg, kidentitymanagement, kimap, kldap, kleopatra, kmail, kmailcommon, kmailimporter, kmailtransport, kmbox, kmessagelib, kmime, knotes, kontactinterface, korganizer, kpimcommon, kpimtextedit, ksmtp, ktnef, libkdepim, libkgapi, libkleo, libksieve): Update to 20.04.1. [source](uri): Adjust to current. (akonadi)[inputs]: Remove KDBUSADDONS and KDESIGNERPLUGIN. (akonadi-calendar)[inputs]: Remove KDBUSADDONS. (kdepim-runtime)[source](patches): Remove. [arguments]: Add phase 'extend-CPLUS_INCLUDE_PATH'. [inputs]: Remove KDBUSADDONS and KICONTHEMES. (kmessagelib)[arguments]: Add phase 'extend-CPLUS_INCLUDE_PATH. [inputs]: Add QCA. (kdepim-apps-libs)[inputs]: Remove KDBUSADDONS and KICONTHEMES. (knotes)[inputs]: Remove KDBUSADDONS. (kpimcommon)[inputs]: Remove KDBUSADDONS and KCOMPLETION. (libksieve)[arguments]: Disable one more test. (korganizer)[arguments]: Disable one test. Marius Bakke
2020-06-06gnu: Add kpeoplevcard....* gnu/packages/kde-pim.scm (kpeoplevcard): New public variable. Marius Bakke
2020-06-06gnu: akonadi-search: Enable tests....* gnu/packages/kde-pim.scm (akonadi-search)[native-inputs]: Add DBUS. [arguments]: Add #:phases. Marius Bakke