From patchwork Mon Aug 30 19:13:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 32419 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5FCCC27BBE3; Mon, 30 Aug 2021 20:15:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D58E127BBE1 for ; Mon, 30 Aug 2021 20:15:16 +0100 (BST) Received: from localhost ([::1]:43252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKmkV-0007fT-SQ for patchwork@mira.cbaines.net; Mon, 30 Aug 2021 15:15:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKmkI-0007aT-N5 for guix-patches@gnu.org; Mon, 30 Aug 2021 15:15:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48764) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKmkI-0004gX-DF for guix-patches@gnu.org; Mon, 30 Aug 2021 15:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mKmkI-0006TC-8N for guix-patches@gnu.org; Mon, 30 Aug 2021 15:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50282] [PATCH 2/5] gnu: offlineimap: Replace with offlineimap3. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Aug 2021 19:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50282 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50282@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 50282-submit@debbugs.gnu.org id=B50282.163035084924709 (code B ref 50282); Mon, 30 Aug 2021 19:15:02 +0000 Received: (at 50282) by debbugs.gnu.org; 30 Aug 2021 19:14:09 +0000 Received: from localhost ([127.0.0.1]:60292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKmjQ-0006QT-OX for submit@debbugs.gnu.org; Mon, 30 Aug 2021 15:14:09 -0400 Received: from mout.gmx.net ([212.227.17.21]:45405) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKmjM-0006PQ-To for 50282@debbugs.gnu.org; Mon, 30 Aug 2021 15:14:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1630350839; bh=16/nGsnNGrvCChKLzfUQDuT0C/7o8tocqp1bmX3rrJ4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=jL6C4imgSAwNhspQaTlxIQ4TMdEk/0ZPp3UZkiJreALNdrpZg/kJrJETcgA7l/qYG Ki0OTKmG6KijpLueeNMR+kS4+iYNrFl+cdevJpm09UEZZH8yqik9EKIO07iZ8S74S8 q5njcIET+l+nLk6/96P8dVOKqcE3GwCxd+pEd9xM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M8QS8-1mPCZa49XE-004VRO; Mon, 30 Aug 2021 21:13:59 +0200 From: Pierre Langlois Date: Mon, 30 Aug 2021 20:13:42 +0100 Message-Id: <20210830191345.7831-2-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210830191345.7831-1-pierre.langlois@gmx.com> References: <87tuj6n467.fsf@gmx.com> <20210830191345.7831-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:JTgMibBknjWuqZuX49iVakEmd907c5I35qJokVcQvoC42qGL3Jo Qj2pmo6kT3jlg0Zrs5d05bgJ7CvyFSIUpi5k6YwqOnY3mIMAQ/do9C9QfF8tbUGs9/btCEB 9EWfW9ySc1tYmcZYBN3du5LVUSU4dgihhqN6tII7k3UqsrLJ2onpY3As8AaXPWK/DSV/LTh 1uZUb8micDI0D6F6lCjeg== X-UI-Out-Filterresults: notjunk:1;V03:K0:movtARX3qCE=:3SsNFG5F0pwQWjdu3oLiTi VFLrhRCU7rPMme6M3xnzIR7JHLRb8h5eUKwsdl6r0QXtHD8BOtmMPMd5Xa2KMhDHwKZwxXOTS WtFrnUroFEUkJy1Kh4XEei/sZYCYxRf63rlVS376SfVilGRgrfKzI+sS8MoNAx598by/5Ad+c pjjOHH1ypp8ghBZ40E90dI5Np5+jbDdjTFTwipVFpDqdylQzL+SxWOUIoikTYiKCqP5toRdO3 5df50yORXtsNX/L7YJC6XhYguvmqCakmQ7M0Ehy+tuKlaw5lm/pXCGscZWXcfup7Qfq2IQSN+ 1XHYzsGUmp6Dlis6ByaiFoY3OFjITAS/XrqZUIqMQXCVk7bFT3p/6BrvxaoC9IbnjxQkvDw/R gBo1yDKgHZRD2Ihf36ckdLjDDS0xa3+dUjTvICAdvYGhsmELag8cSPn4M39igEk7H5lKOcJmH sSxMVaBfcd0OyynRSzSkBavQLOmIo1pcQLXNr0EqA6RpFB708lRAWNCxRC+F1ra5EE6EDjTPu NIdTPabWC4Bpb7JbmsWgS2kGopGUtJoAAbUPlaXK7I/pCIZeAnRS7J2tQw9/ioTmghtkTXh1l ezYmu24dSk7KYFYBLDf2/9odFCfkIgnIsJvcEhX/S9Y4740CY0W68P1hOPqC+d+lt5DOO2IJN WVBBCp6NeqqTpqWUzmERNEne8CqoZbbUQSiiJRod7gh9fzGJyyn+2bgLC7Ui7A/VEb8nAdDfg Y1eppPcNPmPtBq888wfXnY/b/1zHDiLZjCG2lYSuA/Obq2v7tm3qpFAlriZ6Q3vYxvhQrjYcK DiEBUMvF6Ur+miM5bQIqbb0Vv+lYUhRXswa9yZhiGSHKB5wTewCZ5eQYHqsE6RrRW09AA5L3J CfEOw6mV+8oBB/R0WP9p1tgLC0JnmGNH/TsH8/JqXQPB4VeibmjfrpbDFHmCZH2bvs0QG6AtQ MYvGJ7/xw78sCH8fBHHaIVqD7zA6KrZ9XWFHJKqCsCp9Pf2ZPcZW2guBPSfH6Fgy6guwdfF9M 5Xb8nbGu8YIUvOJL65ODeTctKo60yg8CS5ArerzpWRpGbcJZV5YCPvX/ILpzNrj3ywxYht/2C 3b9MW0urcz3M0IxDS9DF0mgyCc1grbnA9M1DgjQGgnnke2p3PP/63FPpg== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mail.scm (offlineimap3): New variable. (offlineimap): Replace with deprecated package. --- gnu/packages/mail.scm | 96 +++++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 45 deletions(-) -- 2.33.0 diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8eb6ec73b8..25a0963e00 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -156,6 +156,7 @@ #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix deprecation) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix svn-download) @@ -1044,53 +1045,58 @@ content (body). The program is able to learn from the user's classifications and corrections. It is based on a Bayesian filter.") (license license:gpl3+))) -(define-public offlineimap - (package - (name "offlineimap") - (version "7.3.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/OfflineIMAP/offlineimap") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1gg8ry67i20qapj4z20am9bm67m2q28kixcj7ja75m897vhzarnq")))) - (build-system python-build-system) - (native-inputs - `(("asciidoc" ,asciidoc))) - (inputs - `(("python2-pysqlite" ,python2-pysqlite) - ("python2-rfc6555" ,python2-rfc6555) - ("python2-six" ,python2-six))) - (arguments - ;; The setup.py script expects python-2. - `(#:python ,python-2 - ;; Tests require a modifiable IMAP account. - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'build 'build-documentation - (lambda _ - (substitute* "docs/Makefile" - ;; Prevent xmllint and xsltproc from downloading a DTD file. - (("a2x -v") "a2x --no-xmllint --xsltproc-opts=--nonet -v")) - (invoke "make" "-C" "docs" "man"))) - (add-after 'install 'install-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man (string-append out "/share/man"))) - (install-file "docs/offlineimap.1" (string-append man "/man1")) - (install-file "docs/offlineimapui.7" (string-append man "/man7")) - #t)))))) - (home-page "https://www.offlineimap.org") - (synopsis "Sync emails between two repositories") - (description - "OfflineImap synchronizes emails between two repositories, so that you +(define-public offlineimap3 + ;; The OfflineIMAP3 fork does not yet have a release, but it's likely to be + ;; 8.0.0 but the source still reports 7.3.0, see + ;; https://github.com/OfflineIMAP/offlineimap3/issues/10. + (let ((commit "4ca9c75c6f9a0cc8dc7b69dd6abf073e494cc0e5") + (revision "0")) + (package + (name "offlineimap3") + (version (git-version "7.3.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OfflineIMAP/offlineimap3") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nzh5dcc559jfw4yy12gc98s17w82b15zxikspc6apd8filmk9xg")))) + (build-system python-build-system) + (native-inputs + `(("asciidoc" ,asciidoc))) + (inputs + `(("python-distro" ,python-distro) + ("python-imaplib2" ,python-imaplib2) + ("python-rfc6555" ,python-rfc6555))) + (arguments + `(;; Tests require a modifiable IMAP account. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'build 'build-documentation + (lambda _ + (substitute* "docs/Makefile" + ;; Prevent xmllint and xsltproc from downloading a DTD file. + (("a2x -v") "a2x --no-xmllint --xsltproc-opts=--nonet -v")) + (invoke "make" "-C" "docs" "man"))) + (add-after 'install 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man"))) + (install-file "docs/offlineimap.1" (string-append man "/man1")) + (install-file "docs/offlineimapui.7" (string-append man "/man7")))))))) + (home-page "https://www.offlineimap.org") + (synopsis "Sync emails between two repositories") + (description + "OfflineImap synchronizes emails between two repositories, so that you can read the same mailbox from multiple computers. It supports IMAP as REMOTE repository and Maildir/IMAP as LOCAL repository.") - (license license:gpl2+))) + (license license:gpl2+)))) + +(define-public offlineimap + (deprecated-package "offlineimap" offlineimap3)) (define-public emacs-mew (package