From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id uHuxENgNEmP1MwAAbAwnHQ (envelope-from ) for ; Fri, 02 Sep 2022 16:06:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id EG24ENgNEmOC7gAAauVa8A (envelope-from ) for ; Fri, 02 Sep 2022 16:06:16 +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 C22BF30BA5 for ; Fri, 2 Sep 2022 16:06:15 +0200 (CEST) Received: from localhost ([::1]:55344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oU7JF-0006Dy-V9 for larch@yhetil.org; Fri, 02 Sep 2022 10:06:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oU7J4-0006Ag-Qh for guix-patches@gnu.org; Fri, 02 Sep 2022 10:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oU7J4-0003Ai-Id for guix-patches@gnu.org; Fri, 02 Sep 2022 10:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oU7J4-0005wP-Dl for guix-patches@gnu.org; Fri, 02 Sep 2022 10:06:02 -0400 Subject: bug#50833: [PATCH] Add Bower (notmuch curses email client) References: <20210926190836.GB8410@gac.attlocal.net> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Fri, 02 Sep 2022 14:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 50833 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo To: jgart Cc: 50833-done@debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= , Sarah Morgensen Mail-Followup-To: 50833@debbugs.gnu.org, maxim.cournoyer@gmail.com, jgart@dismail.de Received: via spool by 50833-done@debbugs.gnu.org id=D50833.166212753422782 (code D ref 50833); Fri, 02 Sep 2022 14:06:02 +0000 Received: (at 50833-done) by debbugs.gnu.org; 2 Sep 2022 14:05:34 +0000 Received: from localhost ([127.0.0.1]:47351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oU7Ib-0005vN-MO for submit@debbugs.gnu.org; Fri, 02 Sep 2022 10:05:34 -0400 Received: from mail-qk1-f177.google.com ([209.85.222.177]:43929) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oU7Ia-0005vA-Bm for 50833-done@debbugs.gnu.org; Fri, 02 Sep 2022 10:05:32 -0400 Received: by mail-qk1-f177.google.com with SMTP id j6so1737612qkl.10 for <50833-done@debbugs.gnu.org>; Fri, 02 Sep 2022 07:05:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:subject:cc:cc :to:from:from:to:cc:subject:date; bh=EQvo5H93Lz4fMm1ijksJ670cNKN9muscjptVqNmmP8U=; b=OOvKARZiq4NBSmWeqF4h2F6ITslhalG/xHid/Fuyo026VOzu8w7EnnYH1vrAgxfgAA uAHYZmMxWKXSQUIPoM/bDKWzSuBNsn7nL1LjCo1u4lZibPn6zRAjSpZ0Pw/Mcqt+ABbO NnM2wO5b3Y+tZILM52djOT9qISjDBdjqwiisO7xbCBz7ukKixGdnoAtCrgsR1S66WhXd 3BR43+Edj1OD3Q0BGXrmHG3/mkoAOSfk9CQG0ZHIox02LVuHvBisMF/woVoZmsSD769W C8Z+VdlmpPMXb7lY22PFARe+aXSF8PhvY6NgN8G/zZqiiI0zgW8eYoUCCJgt+ooE/NeW ADmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:subject:cc:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=EQvo5H93Lz4fMm1ijksJ670cNKN9muscjptVqNmmP8U=; b=XSNKQyFFpi1nXJhgykSt7wWtjEbXZ7DGVfJATT0TvuAjAMbc13DkAw3kB1Vh1sYXSB GCR+ez55v2SJUxvJNwGDION9l6U/JsOvLkmLw4M5srEr4zTwuRApUY1taiGheGWl+l43 KR7nRhGoLN1wPzTXHLMsKd2AJ8riw7NP+JAS56A3dE9Ao/baM5q6iP2vuhJXuwz6xlqe vIyLBfGXnGm51HlAcB0wZ8fEMu3OsljcUfTnb/F+dz70gCdhYaU3Vj4V9bal9s8UAl/l uoZ6zBGacx+bCqi8RpAzXp/H3VNeZ3tXWjqRWgkSXdbteZry5Ekp1m5dn2k+4ptgtIqK vlCg== X-Gm-Message-State: ACgBeo1tYsQYD8JA/DZCbC74T3udrJolKr5O6L7xKO/XZ68fkpg3slOK kar9Az9eAt1rdVPLSN6k/LCFQmwz59k= X-Google-Smtp-Source: AA6agR5UywUV0SAFTE2ZPlDf+HZykxOtuuLKhH78itWAjXuICXcffnzKfTIuarXaInTz30FFgMIFaQ== X-Received: by 2002:a05:620a:3726:b0:6be:9e64:966 with SMTP id de38-20020a05620a372600b006be9e640966mr11559475qkb.720.1662127526537; Fri, 02 Sep 2022 07:05:26 -0700 (PDT) Received: from hurd (dsl-10-128-104.b2b2c.ca. [72.10.128.104]) by smtp.gmail.com with ESMTPSA id w15-20020a05620a424f00b006bbdcb3fff7sm1490690qko.69.2022.09.02.07.05.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Sep 2022 07:05:26 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 02 Sep 2022 10:05:25 -0400 In-Reply-To: nobody's message of "(unknown date)" Message-ID: <87o7vx7ty2.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1662127575; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=EQvo5H93Lz4fMm1ijksJ670cNKN9muscjptVqNmmP8U=; b=Kvn9CZNQgRxTk73fIhk7IxW4EgJkpKBmfu6hvKu9PqOTR6+bkckBSw8rk56yiUSX+zeHPG j32cXBCddX3y+e4O6ElAQyS7K1uws4AcJtWQyvtdV4wHoxSTR2Qvf8/JvujLcyMLAzS4rp qfcbSgETGhBJvIwVlHaQzXAYMypTqypaPrAh0FcCZidKH3H+mzyJykEUGsbXd/cPISfqzk 943L4ktilgqr5vh2fJ4J1s/QsThnqnsZCxRFiupTs+aeJw5kFfzykmNDSIyvv9mgFsmhh8 oI4PhSUa9HwXR+zQPYORWulta0kexnDHhrAM7uW4DJjmaL2lR39o5ovqZfT19g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662127575; a=rsa-sha256; cv=none; b=A1J38KRuqYEGK5T/aETWfEeSF1P3Lg2HaFri++uBZ6Zcp1s8oTB5Lm1UocowRrOwkzReEE ETMl6k910n/D0+zx5tL0HRRYfytZi9Io5zybercQM1pYu+1WnltvCEwvDZctuovD+SCi7w +SGKKfFTodkE+xl04ICM1iOS1kIwqhQ5lmEYSF9rgarP+fSSVPLDkelmV54K0nkz0ezxZa 9iyaCAnAs0v29ZDyhPOIa/dmgc7OKQAmZQz1SyrkyC9Mpe0ZM2vYYIs37cP2Cyl7np538S aSpLvmXDs2Bozw+IFF6FgNxuSo1aBC2cF1wvhWXMe2210DFeVTZWjcHo4IlJNg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=OOvKARZi; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" X-Migadu-Spam-Score: 7.73 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=OOvKARZi; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" X-Migadu-Queue-Id: C22BF30BA5 X-Spam-Score: 7.73 X-Migadu-Scanner: scn1.migadu.com X-TUID: ls/34sBznmiA Hi, jgart writes: > * gnu/packages/mail.scm (bower): New variable. > > Hi Maxim, > > Here's a version 3 patch set. > > I bumped bower to version 1.0 which was released a few days ago. Thanks. I've made the following changes: --8<---------------cut here---------------start------------->8--- modified gnu/packages/mail.scm @@ -1517,51 +1517,50 @@ (define-public bower (source (origin (method git-fetch) - (uri - (git-reference - (url home-page) - (commit version))) + (uri (git-reference + (url home-page) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "0vcsbxlsvr2wv3c7sfr3yj21kbqy259skpxg00vf5bdkbc8qknq4")))) (build-system gnu-build-system) (arguments - (list - #:make-flags - #~(list - "bower" - "man" - (string-append "CC=" #+(cc-for-target)) - (string-append "prefix=" #$output)) - #:phases - #~(modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'patch-executables - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/detect_mime_type.m" - (("\"file") - (string-append "\"" (search-input-file inputs "/bin/file")))) - (substitute* "src/compose.m" - (("\"base64") - (string-append "\"" (search-input-file inputs "/bin/base64")))) - (substitute* "src/prog_config.m" - (("\\(\"false") - (string-append "(\"" (search-input-file inputs "/bin/false"))) - (("\\(\"notmuch\"") - (string-append "(\"" (search-input-file inputs "/bin/notmuch") "\"")) - (("/usr/bin/sendmail") - (search-input-file inputs "/sbin/sendmail"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (with-directory-excursion "tests" - (invoke "make"))))) - (replace 'install - (lambda* _ - (let ((bin (string-append #$output "/bin")) - (man (string-append #$output "/share/man/man1"))) - (install-file "bower" bin) - (install-file "bower.1" man))))))) + (list + #:make-flags #~(list "bower" "man" + (string-append "CC=" #+(cc-for-target)) + (string-append "prefix=" #$output)) + #:parallel-tests? #f ;parallelism breaks test suite + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'patch-executables + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/detect_mime_type.m" + (("\"file\"") + (format #f "~s" (search-input-file inputs "bin/file")))) + (substitute* "src/compose.m" + (("\"base64\"") + (format #f "~s" (search-input-file inputs "bin/base64")))) + (substitute* "src/prog_config.m" + (("shell_quoted\\(\"false\")") + (format #f "shell_quoted(~s)" + (search-input-file inputs "bin/false"))) + (("shell_quoted\\(\"notmuch\")") + (format #f "shell_quoted(~s)" + (search-input-file inputs "bin/notmuch"))) + (("/usr/bin/sendmail") + (search-input-file inputs "/sbin/sendmail"))))) + (replace 'check + (lambda* (#:key parallel-tests? tests? #:allow-other-keys) + (when tests? + (invoke "make" "-C" "tests" + "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1"))))) + (replace 'install + (lambda* _ + (install-file "bower" (string-append #$output "/bin")) + (install-file "bower.1" (string-append #$output + "/share/man/man1"))))))) (native-inputs (list diffutils gawk @@ -1569,14 +1568,14 @@ (define-public bower pandoc util-linux)) (inputs - (list gpgme - coreutils + (list coreutils + gpgme + ncurses notmuch - sendmail - ncurses)) - (synopsis "Terminal client for the notmuch email system") - (description "@code{bower} is a curses frontend for the notmuch email -system. It is written in @{mercury}.") + sendmail)) + (synopsis "Terminal client for the Notmuch email system") + (description "@code{bower} is a curses front-end for the Notmuch email +system, written in the Mercury language.") (license license:gpl3+))) --8<---------------cut here---------------end--------------->8--- I also added: --8<---------------cut here---------------start------------->8--- (properties `((cpe-name . "bower-cpe-refers-to-a-different-bower"))) --8<---------------cut here---------------end--------------->8--- After realizing the CPE database referred to a different package with the same name, reporting a false positive. And pushed! Thank you, Closing. Maxim