From patchwork Tue Dec 13 08:15:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 45232 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 16C5027BBEB; Tue, 13 Dec 2022 08:16:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2663027BBE9 for ; Tue, 13 Dec 2022 08:16:29 +0000 (GMT) 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 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 X-Patchwork-Original-From: phodina via Guix-patches via From: phodina Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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")))))))) > > > 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. > > > + (add-before 'check 'env-setup > > + (lambda* _ > > -^ > Why? > > 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. I also made some small changes to use gexp and 'out' variable in the phase 'wrap-executable'. Thanks! ---- Petr From 960dfac430fdb7315d344b8bae60669712d9f43a Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Sun, 11 Dec 2022 18:10:17 +0100 Subject: [PATCH v2] gnu: Add mygnuhealth. * gnu/packages/medical.scm (mygnuhealth): New variable. diff --git a/gnu/packages/medical.scm b/gnu/packages/medical.scm index 6c9cc757eb..c41d8c8b3d 100644 --- a/gnu/packages/medical.scm +++ b/gnu/packages/medical.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Quiliro +;;; Copyright © 2022 Petr Hodina ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,12 +21,66 @@ (define-module (gnu packages medical) #:use-module (guix build-system python) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (gnu packages databases) + #:use-module (gnu packages kde-frameworks) ; kirigami + #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt)) +(define-public mygnuhealth + (package + (name "mygnuhealth") + (version "1.0.5") + (source (origin + (method url-fetch) + (uri (pypi-uri "MyGNUHealth" version)) + (sha256 + (base32 + "1jcrriccqzb4jx7zayhiqmpvi3cvfy3bbf9zr3m83878f94yww8j")))) + (build-system python-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-after 'install 'wrap-executable + (lambda* (#:key inputs #:allow-other-keys) + (let ((out #$output) + (qml "/lib/qt5/qml")) + (wrap-program (string-append out + "/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")))))))) + (add-before 'check 'env-setup + (lambda _ + (mkdir-p "/tmp/mygh/") + (setenv "HOME" "/tmp")))))) + (native-inputs (list python-pyside-2)) + (inputs (list qtbase-5 + qtdeclarative-5 + qtgraphicaleffects + qtquickcontrols-5 + qtquickcontrols2-5 + kirigami)) + (propagated-inputs (list python-bcrypt python-matplotlib python-requests + python-tinydb)) + (home-page "https://www.gnuhealth.org") + (synopsis "The GNU Health Personal Health Record") + (description + "This package provides GNUHealth Personal Health Record +application for desktop and mobile devices that integrates with the GNU +Health Federation.") + (license gpl3+))) + (define-public openmolar-1 (package (name "openmolar") -- 2.38.1