From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id +JCUI900mGP2JwAAbAwnHQ (envelope-from ) for ; Tue, 13 Dec 2022 09:16:29 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 6HuRI900mGMrhQAAauVa8A (envelope-from ) for ; Tue, 13 Dec 2022 09:16:29 +0100 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 11D1A2BE1A for ; Tue, 13 Dec 2022 09:16:29 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p50Sc-0007Da-LK; Tue, 13 Dec 2022 03:16:22 -0500 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 1p50SZ-00078D-PT for guix-patches@gnu.org; Tue, 13 Dec 2022 03:16:20 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p50SI-0005at-Jm for guix-patches@gnu.org; Tue, 13 Dec 2022 03:16:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p50SI-0001Tp-2b for guix-patches@gnu.org; Tue, 13 Dec 2022 03:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59974] My GNU Health package Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Dec 2022 08:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59974 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: zimoun Cc: 59974@debbugs.gnu.org Received: via spool by 59974-submit@debbugs.gnu.org id=B59974.16709193395678 (code B ref 59974); Tue, 13 Dec 2022 08:16:02 +0000 Received: (at 59974) by debbugs.gnu.org; 13 Dec 2022 08:15:39 +0000 Received: from localhost ([127.0.0.1]:58855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p50Rv-0001TW-3N for submit@debbugs.gnu.org; Tue, 13 Dec 2022 03:15:39 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:62957) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p50Rs-0001TO-N3 for 59974@debbugs.gnu.org; Tue, 13 Dec 2022 03:15:37 -0500 Date: Tue, 13 Dec 2022 08:15:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1670919330; x=1671178530; bh=ZCEj9yX3Rd4YgGD8+lJBNOhorx3OwiQsmOA0/K9TOxc=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=fz2S3rwEAMdppDu0PZ4AzHUhmNDDKTCM5qfTU65C2QGEvDq+DUXA5vUQFqvWjXOVy hXjzKlUfZMLbX43sdGY6k2A4hLE8+xXR+wvzccrj2l7REqXVYQ0CE8SVcficX7d8gk F8cNh8fBq5iP0TBF7YlXzLn1z5dNTm5+oFEhkPd7oORR0V7Cd1RocmR3LhSPsL2EGQ NVvCrvWUYItNxAAertsRZYbzPecpzpeejCOS5akiO/VX4UJhdPVymYX+WvsmddjCqT D+T78ijKiuhJqY90DohENOuuw3TBC5fyFuG4KOqxd8Lgi66GnFaG2HJ/+6zzShlRdR m7I4Xt7GbFCmg== Message-ID: In-Reply-To: <877cywpx35.fsf@gmail.com> References: <877cywpx35.fsf@gmail.com> Feedback-ID: 14143818:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_h9vfAT2VFPfWOzCHIpvys6cKm5NFd16LpUd6Dri8J8" 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: phodina X-ACL-Warn: , phodina via Guix-patches From: phodina 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-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1670919389; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc: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=ZCEj9yX3Rd4YgGD8+lJBNOhorx3OwiQsmOA0/K9TOxc=; b=UQJ6iJfStcyFuSpBI8HA59PWY+o6FQBGdso9qCKdBSDD/MUkMSo7V9R7LpKp2iVy4w2p4d Zcxgg5cP0TjiPfrt+C/3J/LRFBeLEgJuUmEDXm1pqO5M7YmvnvFfnu0xJla0DTJhojvu1M 9Paw/lMrHKmAiUbuVkks7Jbt8vFbYdp0On4No4fB/b5TTRaUFAT1y4XGg1AKvbNRrP23HB ffcLh0dC60yjfeE3zQTVXyBPT6LfBi4Y0kwDSjVQ7dt+hbfVMcLTW7lpKv5xV1+xHzmw8u 87lCfGD+VklVfpGm88CPlJ8buBM0Sye99to13dzoLtZ4/tKyBtT8+51XX1lqPQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=fz2S3rwE; 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=1670919389; a=rsa-sha256; cv=none; b=LAJLs90fOxmZ83s4JdlR7dMIuYfe3eTZPx9/VrH7fjleyiD9AOY9LDe01VkJ3kkmWFZUb9 o7ww9JYAu6TZ5aKwq+qpbKo8o7yK/9eQnIvn6ysrmTRM4wnuwST2sQdKMlNB9iOPGpsvz9 zvmTGW04+m6Mj1WufGezUtFnPIG4eHl16lQBZRm4/jpdLrwzmpk/QR9g7E7Z9tvOYD6KM+ Er0tvB27DkgQzZq8oNHbRxCdR4cPXQm5DdBEoLHcpRDHUUdhb7Bjt3qztV40C8O+gHQ7Jl fw8j65CAaeF0ewYJjsqrcCm+xedYkdbR72ARwR33oq34meT1TMCX+uQEeF2MbQ== X-Migadu-Spam-Score: -1.86 X-Spam-Score: -1.86 X-Migadu-Queue-Id: 11D1A2BE1A X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=fz2S3rwE; 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 X-TUID: cC5JbmqQrU7V This is a multi-part message in MIME format. --b1_h9vfAT2VFPfWOzCHIpvys6cKm5NFd16LpUd6Dri8J8 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Simon, > > + (arguments > > + (list #:phases #~(modify-phases %standard-phases > > + (add-after 'install 'wrap-executable > > + (lambda* (#:key inputs outputs #:allow-other-keys) > > + (let ((out (assoc-ref outputs "out")) > > + (qml "/lib/qt5/qml")) > > + (wrap-program (string-append #$output > > + "/bin/mygnuhealth") > > + `("QML2_IMPORT_PATH" ":" prefix > > + (,(string-append out qml) > > + ,@(map (lambda (i) > > + (string-append > > + (assoc-ref inputs i) qml)) > > + '("kirigami" > > + "qtdeclarative" > > + "qtgraphicaleffects" > > + "qtquickcontrols" > > + "qtquickcontrols2")))))))) >=20 >=20 > Here, I have another indentation. I do not have an opinion. To me it's also reasonable. I just use 'guix style PKG' and fix the results= if they have weird indentation. >=20 > > + (add-before 'check 'env-setup > > + (lambda* _ >=20 > -^ > Why? >=20 > Is lambda is not enough here? I guess it was just copy paste of the the previous phase and I realized the= keywords aren't necessary. Fixed to use just lambda as suggested.=20 I also made some small changes to use gexp and 'out' variable in the phase = 'wrap-executable'. Thanks! ---- Petr --b1_h9vfAT2VFPfWOzCHIpvys6cKm5NFd16LpUd6Dri8J8 Content-Type: text/x-patch; name=v2-0001-gnu-Add-mygnuhealth.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=v2-0001-gnu-Add-mygnuhealth.patch RnJvbSA5NjBkZmFjNDMwZmRiNzMxNWQzNDRiOGJhZTYwNjY5NzEyZDlmNDNhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRyIEhvZGluYSA8cGhvZGluYUBwcm90b25tYWlsLmNvbT4K RGF0ZTogU3VuLCAxMSBEZWMgMjAyMiAxODoxMDoxNyArMDEwMApTdWJqZWN0OiBbUEFUQ0ggdjJd IGdudTogQWRkIG15Z251aGVhbHRoLgoKKiBnbnUvcGFja2FnZXMvbWVkaWNhbC5zY20gKG15Z251 aGVhbHRoKTogTmV3IHZhcmlhYmxlLgoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9tZWRpY2Fs LnNjbSBiL2dudS9wYWNrYWdlcy9tZWRpY2FsLnNjbQppbmRleCA2YzljYzc1N2ViLi5jNDFkOGM4 YjNkIDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvbWVkaWNhbC5zY20KKysrIGIvZ251L3BhY2th Z2VzL21lZGljYWwuc2NtCkBAIC0xLDYgKzEsNyBAQAogOzs7IEdOVSBHdWl4IC0tLSBGdW5jdGlv bmFsIHBhY2thZ2UgbWFuYWdlbWVudCBmb3IgR05VCiA7OzsgQ29weXJpZ2h0IMKpIDIwMTcgUmlj YXJkbyBXdXJtdXMgPHJla2Fkb0BlbGVwaGx5Lm5ldD4KIDs7OyBDb3B5cmlnaHQgwqkgMjAxNyBR dWlsaXJvIDxxdWlsaXJvQGZzZmxhLm9yZz4KKzs7OyBDb3B5cmlnaHQgwqkgMjAyMiBQZXRyIEhv ZGluYSA8cGhvZGluYUBwcm90b25tYWlsLmNvbT4KIDs7OwogOzs7IFRoaXMgZmlsZSBpcyBwYXJ0 IG9mIEdOVSBHdWl4LgogOzs7CkBAIC0yMCwxMiArMjEsNjYgQEAKIChkZWZpbmUtbW9kdWxlIChn bnUgcGFja2FnZXMgbWVkaWNhbCkKICAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkLXN5c3RlbSBw eXRob24pCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBkb3dubG9hZCkKKyAgIzp1c2UtbW9kdWxlIChn dWl4IGdleHApCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBsaWNlbnNlcykKICAgIzp1c2UtbW9kdWxl IChndWl4IHBhY2thZ2VzKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBkYXRhYmFzZXMp CisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGtkZS1mcmFtZXdvcmtzKSA7IGtpcmlnYW1p CisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHB5dGhvbi1jcnlwdG8pCisgICM6dXNlLW1v ZHVsZSAoZ251IHBhY2thZ2VzIHB5dGhvbi13ZWIpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIHB5dGhvbi14eXopCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHF0KSkKIAorKGRl ZmluZS1wdWJsaWMgbXlnbnVoZWFsdGgKKyAgKHBhY2thZ2UKKyAgICAobmFtZSAibXlnbnVoZWFs dGgiKQorICAgICh2ZXJzaW9uICIxLjAuNSIpCisgICAgKHNvdXJjZSAob3JpZ2luCisgICAgICAg ICAgICAgIChtZXRob2QgdXJsLWZldGNoKQorICAgICAgICAgICAgICAodXJpIChweXBpLXVyaSAi TXlHTlVIZWFsdGgiIHZlcnNpb24pKQorICAgICAgICAgICAgICAoc2hhMjU2CisgICAgICAgICAg ICAgICAoYmFzZTMyCisgICAgICAgICAgICAgICAgIjFqY3JyaWNjcXpiNGp4N3pheWhpcW1wdmkz Y3ZmeTNiYmY5enIzbTgzODc4Zjk0eXd3OGoiKSkpKQorICAgIChidWlsZC1zeXN0ZW0gcHl0aG9u LWJ1aWxkLXN5c3RlbSkKKyAgICAoYXJndW1lbnRzCisgICAgIChsaXN0ICM6cGhhc2VzICN+KG1v ZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcworICAgICAgICAgICAgICAgICAgICAgICAgKGFk ZC1hZnRlciAnaW5zdGFsbCAnd3JhcC1leGVjdXRhYmxlCisgICAgICAgICAgICAgICAgICAgICAg ICAgIChsYW1iZGEqICgjOmtleSBpbnB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChsZXQgKChvdXQgIyRvdXRwdXQpCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKHFtbCAiL2xpYi9xdDUvcW1sIikpCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAod3JhcC1wcm9ncmFtIChzdHJpbmctYXBwZW5kIG91dAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL2Jpbi9t eWdudWhlYWx0aCIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGAoIlFNTDJfSU1QT1JUX1BBVEgiICI6IiBwcmVmaXgKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAoLChzdHJpbmctYXBwZW5kIG91dCBxbWwpCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICxAKG1hcCAobGFtYmRhIChp KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAo c3RyaW5nLWFwcGVuZAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKGFzc29jLXJlZiBpbnB1dHMgaSkgcW1sKSkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJygia2lyaWdhbWkiCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInF0ZGVjbGFyYXRpdmUiCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInF0Z3JhcGhpY2Fs ZWZmZWN0cyIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAicXRxdWlja2NvbnRyb2xzIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICJxdHF1aWNrY29udHJvbHMyIikpKSkpKSkpCisgICAgICAgICAgICAgICAg ICAgICAgICAoYWRkLWJlZm9yZSAnY2hlY2sgJ2Vudi1zZXR1cAorICAgICAgICAgICAgICAgICAg ICAgICAgICAobGFtYmRhIF8KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAobWtkaXItcCAi L3RtcC9teWdoLyIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHNldGVudiAiSE9NRSIg Ii90bXAiKSkpKSkpCisgICAgKG5hdGl2ZS1pbnB1dHMgKGxpc3QgcHl0aG9uLXB5c2lkZS0yKSkK KyAgICAoaW5wdXRzIChsaXN0IHF0YmFzZS01CisgICAgICAgICAgICAgICAgICBxdGRlY2xhcmF0 aXZlLTUKKyAgICAgICAgICAgICAgICAgIHF0Z3JhcGhpY2FsZWZmZWN0cworICAgICAgICAgICAg ICAgICAgcXRxdWlja2NvbnRyb2xzLTUKKyAgICAgICAgICAgICAgICAgIHF0cXVpY2tjb250cm9s czItNQorICAgICAgICAgICAgICAgICAga2lyaWdhbWkpKQorICAgIChwcm9wYWdhdGVkLWlucHV0 cyAobGlzdCBweXRob24tYmNyeXB0IHB5dGhvbi1tYXRwbG90bGliIHB5dGhvbi1yZXF1ZXN0cwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBweXRob24tdGlueWRiKSkKKyAgICAoaG9tZS1w YWdlICJodHRwczovL3d3dy5nbnVoZWFsdGgub3JnIikKKyAgICAoc3lub3BzaXMgIlRoZSBHTlUg SGVhbHRoIFBlcnNvbmFsIEhlYWx0aCBSZWNvcmQiKQorICAgIChkZXNjcmlwdGlvbgorICAgICAi VGhpcyBwYWNrYWdlIHByb3ZpZGVzIEdOVUhlYWx0aCBQZXJzb25hbCBIZWFsdGggUmVjb3JkCith cHBsaWNhdGlvbiBmb3IgZGVza3RvcCBhbmQgbW9iaWxlIGRldmljZXMgdGhhdCBpbnRlZ3JhdGVz IHdpdGggdGhlIEdOVQorSGVhbHRoIEZlZGVyYXRpb24uIikKKyAgICAobGljZW5zZSBncGwzKykp KQorCiAoZGVmaW5lLXB1YmxpYyBvcGVubW9sYXItMQogICAocGFja2FnZQogICAgKG5hbWUgIm9w ZW5tb2xhciIpCi0tIAoyLjM4LjEKCg== --b1_h9vfAT2VFPfWOzCHIpvys6cKm5NFd16LpUd6Dri8J8--