From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id mCmIEKLgvGShiQAASxT56A (envelope-from ) for ; Sun, 23 Jul 2023 10:11:14 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id GCyYD6LgvGRQUwEAG6o9tA (envelope-from ) for ; Sun, 23 Jul 2023 10:11:14 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 68A585CDC8 for ; Sun, 23 Jul 2023 10:11:12 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b="dlejzh/z"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1690099874; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=k9tiirZbWuDPOwPWGP2DjkxJ+Lxbr8FLrqKqLCIGlHA=; b=S2FcFf5FDN2RF269153GE1krOop6jVyMGXxx8lLQ9l1oNeWcKzngJFgJq2QOoMmzT8t320 6jDcTZUqzEC5XPZ8NxeVkLv1AktHUlnziRRsLGCJ9pfPw9r6Ud6sWcx1n45uRCBGjXc8lG gbEaaoi37tJdKatwQoKf8nRGnZE9ZIvBFIwI6u0SensxW/VX3Rdub3QLkc/3GmynDGJYzw qx0R9P5LIanQdaLBm+jCFPqsCyJ73Oj0jMne05vZXCv9RJURXnEEHuCLnNCJC62gAQh0a5 bVJqP4UshJXpp/pY7Yj4dhsOJr9nt2fcWxW3Y6xpG4PxisRer+fCWvdGl+pV2A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b="dlejzh/z"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1690099874; a=rsa-sha256; cv=none; b=AtYsRitmu66H8JC57rUHbm29uG7y0lP9dWYEEJCFN49uOflFLe+msK4GFGt1fcsQJ/pvNZ ECPyLEO1zyxSEaeqKPwWHXBaR5JeaoVQEUgx5PXDz3g8HGwqzmr5Cbct4EwjjtZ93eVVRV KQCuWt7NWvDmHCKhT1o2+us26wToB31eZFQtYNvLLUgUEU3MNKhgiKXB9hcyUGVe/ajxiK lSrNdkmvpX8lcRMHM0FMi1cucfmY9riZMQWaAdDNQLAJ6qduLDwxC1QgWZt/QBNzkZkmOH jCs+XDT7nsdqP1EDlTOvSyweXDTiN/sT7A4aW/gbgD6KCeCevOYtvqv3UkrFTA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNUBF-0004qU-34; Sun, 23 Jul 2023 04:11:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qNUBC-0004qB-QM for guix-patches@gnu.org; Sun, 23 Jul 2023 04:11:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qNUBC-0003rR-ID for guix-patches@gnu.org; Sun, 23 Jul 2023 04:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNUBC-0002p9-DP for guix-patches@gnu.org; Sun, 23 Jul 2023 04:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH 000/209] update kde package and add plasme desktop Resent-From: Zheng Junjie <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Jul 2023 08:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64798@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169009983510805 (code B ref -1); Sun, 23 Jul 2023 08:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Jul 2023 08:10:35 +0000 Received: from localhost ([127.0.0.1]:37924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNUAk-0002oC-KF for submit@debbugs.gnu.org; Sun, 23 Jul 2023 04:10:35 -0400 Received: from lists.gnu.org ([2001:470:142::17]:48230) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1qNUAd-0002nj-Hj for submit@debbugs.gnu.org; Sun, 23 Jul 2023 04:10:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1qNUAY-0004Vl-8F for guix-patches@gnu.org; Sun, 23 Jul 2023 04:10:22 -0400 Received: from out203-205-251-27.mail.qq.com ([203.205.251.27]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1qNUAS-0003ZK-9n for guix-patches@gnu.org; Sun, 23 Jul 2023 04:10:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1690099805; bh=k9tiirZbWuDPOwPWGP2DjkxJ+Lxbr8FLrqKqLCIGlHA=; h=From:To:Subject:Date; b=dlejzh/zar9YSgxmkEc5fKYIHufjqAkO+QsfUgdG6O2IcmWPQCBR8nCPbtfVnXWLN B6lDFdxqvYerYOnEcg5I116fIYtaEHLIlhRW2k5Z5UEPpxZOyrqUwPbD0LopKVSaMh 7Y+uCjT6KVr6dAQNVIdEcMWM62N3yuzRFPrzeYlU= Received: from localhost.localdomain ([111.0.51.236]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 28336C5D; Sun, 23 Jul 2023 16:10:03 +0800 X-QQ-mid: xmsmtpt1690099803to5wyw8f0 Message-ID: X-QQ-XMAILINFO: NY3HYYTs4gYSJ/hjwxJpVlkIcZ4X4Ezq02Bif67MRUsC36OOoHnj8OX3yZh+Ds OxF7mxfb2uYcfgQapBjhF9tiUw9a2LsJVL54E9UxWqfKUmzW1bKqMn+g11BLWYlYOtqkm3FSO2eA oN6Tnybvl0RCPxIjXkb9vBw611IbLq9zfVmCBZoQdBVtVwfvq6vD1zbu7AKt4k90O77q5FHsXxCx kpE7FW65rvyL5aAa9CY9SqrgiWMsotxiwZhqslO4DCZFjUovUretOpr+5thnzs7GyYRDR3DftbFn NiizOdLN1j4GXPp4J0K+PO/Hbfq50sPVRRW9Xc3Op86HHaP2AdkdC5SRQcIftVdIKe73Zvhmd0a7 d/wXLCvHCQrgAZpZWEd110d3+GjDUrCczckEazo01vgSC71DobmWZusHlcxgjdLz2idkqxOsxWY8 or4ht6nyu6D4bWkF2FWdxMCBLML8UwdlzvkBN437A9wOSQCENmYkUCaCP40CdCxcpuC8FW8WjZzE MLB3bPsqjnaxhdla9SjGpE75T0swUsk8aRC2nm6yDWlugidijv96vsbBDAcJ0zVtNhFyNBHDIYFC ZTTpXLa0NbGTw/UrN1O38rj283gdPo1721TokaKYuDblEMDcPt5LwuqlC1Oop8qcEyzd4vzyJKK6 ZphiHQc+EcQ4D+liwhq54iaZW0FpDgbivssPuLsDU1UuCPLwFRQIGy3blqUGe1x7Ac1yp8CwRFLl DL5pulPF/j3Y3TztzNVGb+i7hpfYjG2Ecdm+q4IsQdvnJOhYlqOwnn3Xn1+z9WXBCqfCbzyzUyp7 wE21yQEtxxtMwuE6/uE+rK90Lmfe49KhZDOr7cl7OHs0GU278t9OUrNKx0+MovfN0FX0gxfHGazi 2WqREm15023FNJFseZA8gMypPbXSr54S+uTOi2Y39gClQV3xCsX0Ow6nhsiUghF/kZ1iwHXVmd0I rTsmDSUniBzvnzbNC41Y+QNRBGTqg5Da3+fApGWhA= X-QQ-XMRINFO: Nq+8W0+stu50PRdwbJxPCL0= Date: Sun, 23 Jul 2023 16:09:48 +0800 X-OQ-MSGID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=203.205.251.27; envelope-from=873216071@qq.com; helo=out203-205-251-27.mail.qq.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, HELO_DYNAMIC_IPADDR=1.951, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Zheng Junjie <873216071@qq.com> X-ACL-Warn: , Zheng Junjie via Guix-patches From: Zheng Junjie via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: -3.15 X-Migadu-Queue-Id: 68A585CDC8 X-Migadu-Spam-Score: -3.15 X-Migadu-Scanner: mx0.migadu.com X-TUID: zRLMoMN23Zts hello! I updated some kde package, and add plasma desktop. and have some other changes: 1. change qt-wrap wrap QML2_IMPORT_PATH from `=' to `prefix', because some qt program have optional/circular runtime qml dependencies, so get them from environment. 2. add some envvar to sddm service, make breeze theme work. you also can see in https://github.com/Z572/guix/tree/kde-5.108.0 Hartmut Goebel (1): services: Add Plasme desktop service. Zheng Junjie (208): gnu: extra-cmake-modules: Update to 5.108.0. gnu: kconfig: Update to 5.108.0. gnu: kquickcharts: Update to 5.108.0. gnu: attica: Update to 5.108.0. gnu: attica: use G-expressions. gnu: bluez-qt: Update to 5.108.0. gnu: breeze-icons: Update to 5.108.0. gnu: kapidox: Update to 5.108.0. gnu: kapidox: use G-expressions. gnu: karchive: Update to 5.108.0. gnu: kcalendarcore: Update to 5.108.0. gnu: kcalendarcore: use G-expressions. gnu: kcodecs: Update to 5.108.0. gnu: kcoreaddons: Update to 5.108.0. gnu: kcoreaddons: use G-expressions. gnu: kauth: Update to 5.108.0. gnu: kauth: use G-expressions. gnu: kwidgetsaddons: Update to 5.108.0. gnu: kwidgetsaddons: use G-expressions. gnu: kwindowsystem: Update to 5.108.0. gnu: kwindowsystem: use G-expressions. gnu: modemmanager-qt: Update to 5.108.0. gnu: modemmanager-qt: use G-expressions. gnu: networkmanager-qt: Update to 5.108.0. gnu: networkmanager-qt: use G-expressions. gnu: oxygen-icons: Update to 5.108.0. gnu: prison: Update to 5.108.0. gnu: ki18n: Update to 5.108.0. gnu: ki18n: use G-expressions. gnu: kidletime: Update to 5.108.0. gnu: kirigami: Update to 5.108.0. gnu: kitemmodels: Update to 5.108.0. gnu: kitemviews: Update to 5.108.0. gnu: kplotting: Update to 5.108.0. gnu: ksyntaxhighlighting: Update to 5.108.0. gnu: kcompletion: Update to 5.108.0. gnu: kcrash: Update to 5.108.0. gnu: kcontacts: Update to 5.108.0. gnu: kcontacts: use G-expressions. gnu: kjobwidgets: Update to 5.108.0. gnu: knotifications: Update to 5.108.0. gnu: knotifications: use G-expressions. gnu: kpty: Update to 5.108.0. gnu: kpty: use G-expressions. gnu: kunitconversion: Update to 5.108.0. gnu: syndication: Update to 5.108.0. gnu: kdoctools: Update to 5.108.0. gnu: kdoctools: use G-expressions. gnu: kpackage: Update to 5.108.0. gnu: kpackage: use G-expressions. gnu: kguiaddons: Update to 5.108.0. gnu: kholidays: Update to 5.108.0. gnu: kconfigwidgets: Update to 5.108.0. gnu: kconfigwidgets: use G-expressions. gnu: kiconthemes: Update to 5.108.0. gnu: sonnet: Update to 5.108.0. gnu: solid: Update to 5.108.0. gnu: solid: use G-expressions. gnu: threadweaver: Update to 5.108.0. gnu: kjs: Update to 5.108.0. gnu: kjsembed: Update to 5.108.0. gnu: plasma-wayland-protocols: Update to 1.10.0. gnu: kwayland: Update to 5.108.0. gnu: kdnssd: Update to 5.108.0. gnu: kimageformats: Update to 5.108.0. gnu: kimageformats: use G-expressions. gnu: kdesignerplugin: Update to 5.108.0. gnu: kdbusaddons: Update to 5.108.0. gnu: kglobalaccel: Update to 5.108.0. gnu: kservice: Update to 5.108.0. gnu: kxmlgui: Update to 5.108.0. gnu: kbookmarks: Update to 5.108.0. gnu: ktextwidgets: Update to 5.108.0. gnu: kpeople: Update to 5.108.0. gnu: kwallet: Update to 5.108.0. gnu: kded: Update to 5.108.0. gnu: kdesu: Update to 5.108.0. gnu: kemoticons: Update to 5.108.0. gnu: kemoticons: use G-expressions. gnu: qqc2-desktop-style: Update to 5.108.0. gnu: kfilemetadata: Update to 5.108.0. gnu: kfilemetadata: use G-expressions. gnu: kio: Update to 5.108.0. gnu: kdeclarative: Update to 5.108.0. gnu: kdeclarative: use G-expressions. gnu: kactivities: Update to 5.108.0. gnu: kactivities-stats: Update to 5.108.0. gnu: kcmutils: Update to 5.108.0. gnu: kcmutils: use G-expressions. gnu: knotifyconfig: Update to 5.108.0. gnu: kparts: Update to 5.108.0. gnu: kinit: Update to 5.108.0. gnu: kdav: Update to 5.108.0. gnu: kdav: use G-expressions. gnu: kross: Update to 5.108.0. gnu: kmediaplayer: Update to 5.108.0. gnu: purpose: Update to 5.108.0. gnu: purpose: use G-expressions. gnu: kxmlrpcclient: Update to 5.108.0. gnu: kdelibs4support: Update to 5.108.0. gnu: khtml: Update to 5.108.0. gnu: ktexteditor: Update to 5.108.0. gnu: baloo: Update to 5.108.0. gnu: baloo: use G-expressions. gnu: knewstuff: Update to 5.108.0. gnu: plasma-framework: Update to 5.108.0. gnu: plasma-framework: use G-expressions. gnu: kde-frameworkintegration: Update to 5.108.0. gnu: krunner: Update to 5.108.0. gnu: grantlee: Update to 5.3.1. gnu: grantlee: use G-expressions. gnu: grantleetheme: Update to 23.04.3. gnu: baloo-widgets: Update to 23.04.3. gnu: libkomparediff2: Update to 23.04.3. gnu: qca: Update to 2.3.6. gnu: kdf: Update to 23.04.3. gnu: poxml: Update to 23.04.3. gnu: kdegraphics-mobipocket: Update to 23.04.3. gnu: libkexiv2: Update to 23.04.3. gnu: libkdegames: Update to 23.04.3. gnu: kcachegrind: Update to 23.04.3. gnu: ktimer: Update to 23.04.3. gnu: kirigami-addons: Update to 0.9.0. gnu: kdeconnect: Update to 23.04.3. gnu: kdeconnect: use G-expressions. gnu: kpmcore: Update to 23.04.3. gnu: kpmcore: use G-expressions. gnu: kosmindoormap: Update to 23.04.3. gnu: kopeninghours: Update to 23.04.3. gnu: kopeninghours: use G-expressions. gnu: marble-qt: Update to 23.04.3. gnu: marble-qt: use G-expressions. gnu: okular: Update to 23.04.3. gnu: kdevelop-pg-qt: Update to 2.2.2. gnu: kpublictransport: Update to 23.04.3. gnu: kpublictransport: use G-expressions. gnu: dolphin: Update to 23.04.3. gnu: dolphin-plugins: Update to 23.04.3. gnu: konsole: Update to 23.04.3. gnu: yakuake: Update to 23.04.3. gnu: ksystemlog: Update to 23.04.3. gnu: khelpcenter: Update to 23.04.3. gnu: khelpcenter: use G-expressions. gnu: bluedevil: Update to 5.27.6. gnu: kactivitymanagerd: Update to 5.27.6. gnu: kdecoration: Update to 5.27.6. gnu: kwayland-server: Update to 5.24.7. gnu: breeze: Update to 5.27.6. gnu: breeze-gtk: Update to 5.27.6. gnu: drkonqi: Update to 5.27.6. gnu: kgamma: Update to 5.27.6. gnu: kmenuedit: Update to 5.27.6. gnu: ksshaskpass: Update to 5.27.6. gnu: libksysguard: Update to 5.27.6. gnu: kwallet-pam: Update to 5.27.6. gnu: kwrited: Update to 5.27.6. gnu: milou: Update to 5.27.6. gnu: oxygen-sounds: Update to 5.27.6. gnu: plasmatube: Update to 23.01.0. gnu: plasma-disks: Update to 5.27.6. gnu: plasma-firewall: Update to 5.27.6. gnu: plasma-nano: Update to 5.27.6. gnu: plasma-pa: Update to 5.27.6. gnu: polkit-kde-agent: Update to 5.27.6. gnu: calindori: Update to 23.01.0. gnu: kongress: Update to 23.01.0. gnu: bluedevil: Update to 5.27.6. gnu: libkscreen: Update to 5.27.6. gnu: kscreen: Update to 5.27.6. gnu: layer-shell-qt: Update to 5.27.6. gnu: plasma-workspace-wallpapers: Update to 5.27.6. gnu: plasma-vault: Update to 5.27.6. gnu: kwayland-integration: Update to 5.27.6. gnu: plasma-nm: Update to 5.27.6. gnu: plasma-systemmonitor: Update to 5.27.6. gnu: ksystemstats: Update to 5.27.6. gnu: Add qtvirtualkeyboard-5. gnu: kscreenlocker: Update to 5.27.6. gnu: kscreenlocker: Format with 'guix style'. gnu: discover: Update to 5.27.6. gnu: Add wayland-protocols-next. gnu: kwin: Update to 5.27.6. gnu: kio-extras: Update to 23.04.3. gnu: plasma-workspace: Update to 5.27.6. gnu: plasma-desktop: Update to 5.27.6. gnu: kde-cli-tools: Update to 5.27.6. gnu: khotkeys: Update to 5.27.6. gnu: system-settings: Update to 5.27.6. gnu: powerdevil: Update to 5.27.6. gnu: plasma-integration: Update to 5.27.6. gnu: plasma-browser-integration: Update to 5.27.6. gnu: plasma-bigscreen: Update to 5.26.90. gnu: kinfocenter: Update to 5.27.6. gnu: plasma: Update to 5.27.6. gnu: xdg-desktop-portal-kde: Update to 5.27.6. gnu: plasma-welcome: Update to 5.27.6. gnu: kmix: Update to 23.04.3. gnu: kwave: Update to 23.04.3. gnu: kid3: Update to 3.9.4. gnu: libkcompactdisc: Update to 23.04.3. gnu: libkcddb: Update to 23.04.3. gnu: system-settings: add some qml runtime dependency to inputs. gnu: plasma-workspace: add some qml runtime dependency to inputs. gnu: plasma-desktop: add qtquickcontrols-5 to inputs. qt-utils: wrap QML2_IMPORT_PATH from '=' to 'prefix'. services: sddm: set some envvar to constructor. gnu: plasma: cleanup propagated-inputs. examples: add plasma operating-system example Makefile.am | 1 + doc/guix.texi | 18 + gnu/local.mk | 1 - gnu/packages/freedesktop.scm | 26 +- gnu/packages/kde-frameworks.scm | 1008 +++++++++-------- gnu/packages/kde-multimedia.scm | 22 +- gnu/packages/kde-plasma.scm | 567 ++++++---- gnu/packages/kde-systemtools.scm | 55 +- gnu/packages/kde.scm | 225 ++-- .../patches/kwayland-skip-flaky-test.patch | 13 - gnu/packages/qt.scm | 60 +- gnu/services/desktop.scm | 53 + gnu/services/sddm.scm | 11 +- gnu/system/examples/plasma.tmpl | 67 ++ guix/build/qt-utils.scm | 2 +- 15 files changed, 1251 insertions(+), 878 deletions(-) delete mode 100644 gnu/packages/patches/kwayland-skip-flaky-test.patch create mode 100644 gnu/system/examples/plasma.tmpl base-commit: fdfea4c4ed0d31494fcb3633c26290f4eba9d2af -- 2.41.0