From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id QMoOLexQKGQDSgAASxT56A (envelope-from ) for ; Sat, 01 Apr 2023 17:42:36 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 8EgDLexQKGRWNgEA9RJhRA (envelope-from ) for ; Sat, 01 Apr 2023 17:42:36 +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 E70C0F03E for ; Sat, 1 Apr 2023 17:42:35 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pidMh-0003O8-SA; Sat, 01 Apr 2023 11:42:03 -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 1pidMg-0003Np-KZ for guix-patches@gnu.org; Sat, 01 Apr 2023 11:42:02 -0400 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 1pidMg-0002af-D1 for guix-patches@gnu.org; Sat, 01 Apr 2023 11:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pidMf-0005zU-Qw for guix-patches@gnu.org; Sat, 01 Apr 2023 11:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50578] [PATCH] gnu: Add minipro Resent-From: Thomas Albers Raviola Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Apr 2023 15:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50578 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Bruno Victal Cc: 50578@debbugs.gnu.org Received: via spool by 50578-submit@debbugs.gnu.org id=B50578.168036369622992 (code B ref 50578); Sat, 01 Apr 2023 15:42:01 +0000 Received: (at 50578) by debbugs.gnu.org; 1 Apr 2023 15:41:36 +0000 Received: from localhost ([127.0.0.1]:38404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pidMF-0005yj-T9 for submit@debbugs.gnu.org; Sat, 01 Apr 2023 11:41:36 -0400 Received: from gamma.thomaslabs.org ([38.242.253.186]:49924 helo=localhost) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pidME-0005ya-9W for 50578@debbugs.gnu.org; Sat, 01 Apr 2023 11:41:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=default; t=1680363691; bh=2hNu9Mmp0YYPf6nzaLWF5IqfZ5RyX+FQcH7dTdCXUqw=; h=date:references: in-reply-to:subject:cc:to:from; d=thomaslabs.org; b=MDdwc+ErQP7YxnENij iwXTl4gOMKLPjVLmsCgzWP9YqlBSvO70Ec1BATHsrunN9DTEnT2860vBH+uSMwrT93rF6H b6ZpxXGz2d6wDHcIfRiET1Ny4fUFOqHWx2WTDEwQJPfrLzjA6aH3lxvNeeUZnmTETSRXI4 MWPC0uqAUbpYszPv3LxXWD5+f9Rj71t2CfeonBcGRRmES7kcOKYcG2TtBdaOkpPGxCs0Pc 7dj17A6X8oTiufoQgnXQe9TxFSn+TAyebTrgVfx8QcxnEApG3oHqzbi1KwpYAiWDphCSTT 2PG5IYQIedhF8XjqmJs3TkiyKh5Xxie9JY3cCyDF/Arg== Received: from localhost (dslb-002-201-212-077.002.201.pools.vodafone-ip.de [2.201.212.77]) by localhost (OpenSMTPD) with ESMTPSA id e4307720 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 1 Apr 2023 15:41:31 +0000 (UTC) In-Reply-To: <617becc9-a8c6-e269-fb14-4c7e5178ef0b@makinata.eu> References: <20210914105601.12562-1-thomas@thomaslabs.org> <617becc9-a8c6-e269-fb14-4c7e5178ef0b@makinata.eu> Date: Sat, 01 Apr 2023 17:41:23 +0200 Message-ID: <87lejbmwyk.fsf@alpha.mail-host-address-is-not-set> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: Thomas Albers Raviola X-ACL-Warn: , Thomas Albers Raviola via Guix-patches From: Thomas Albers Raviola 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-Seal: i=1; s=key1; d=yhetil.org; t=1680363756; a=rsa-sha256; cv=none; b=tObihrPNcFXMm3puZjw1VP+Li3QSk6EKTAo3N8yB5VjcpgiXUDijdkjOoAKTQ3XNEHi1uq sdaQ3dhcQaKRDQscH/4mukO60+hYwAnWDDHLTCKNf99NcrlFyZI5Nj9875IjTuCFiVPvRc nqzFhjOMC7TQVh9zs/PH0l7xasu9W7pSED+pZaVgm8hfMLXeLOXKEsZBoJGgfCLBzn5jnb vsluhrFTcEul0WURHD2AxNKSzlBsXxEJfKMDP/qnDOh/R3vBCWbhHN0HHD/dEhMMScjbP5 LzrsAyYcNPycNW+hJVisZQSs3Eeb1lCayhTNcSn+EUZrOm9t9hH3CwfrQi8XOA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=thomaslabs.org header.s=default header.b=MDdwc+Er; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680363756; 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: content-transfer-encoding:content-transfer-encoding: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=d9ElT3R/nlCPGeqGBhVKFgwp+QW/PISOB7SUlJ3SUfc=; b=HEf+ve2mqf2IX6kf9vbKO4Q/a7CnZpCR/3Ladz46fHtaN7NC/NKsPE95UGab+mPZ8KxxlU taDdDOVYK9xWxxPJuFjQfL7RFGoj2DlizAjILoVt/BVC+mw7AoRYVVD95x2TQCX1u0UuBS w0jvMNonPB10uHNP9k5g2XdINthMles+T7K0uxAVMgUudsRDCd/tWlmTVNsxJAdaiw/GOn 7xHOIxbieqP+B2MrUi4abjLMPNKDfdQ0mCJzmdyksD8kd8qC2gixc5fDfhV1xb+yBcqBuo vAK6FfgpGbPF05ZYH3LtDtFVsLTSQwGKLXCr4yl7I62oNWraQbQ2cwArSTQo5A== X-Migadu-Spam-Score: -3.73 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=thomaslabs.org header.s=default header.b=MDdwc+Er; dmarc=pass (policy=none) header.from=gnu.org; 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-Spam-Score: -3.73 X-Migadu-Queue-Id: E70C0F03E X-TUID: rtUAfBXM+NNk Hi Bruno, yes, I am still maintaining a local copy of this package. I have a question regarding your observations though. Could you please reference some example in the guix source base, how one is supposed to rewrite the fixes as a G-Expression in this context? I am not familiar with this specific use. Also the manual does not show something similar AFAIK. Regards, Thomas Bruno Victal writes: > Hi Thomas, > > On 2021-09-14 11:56, Thomas Albers via Guix-patches via wrote: >> --- >> gnu/packages/electronics.scm | 66 ++++++++++++++++++++++++++++++++++++ >> 1 file changed, 66 insertions(+) >>=20 >> diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm >> index 0e985c9750..e6abdc6562 100644 >> --- a/gnu/packages/electronics.scm >> +++ b/gnu/packages/electronics.scm >> @@ -4,6 +4,7 @@ >> ;;; Copyright =C2=A9 2019 Cl=C3=A9ment Lassieur >> ;;; Copyright =C2=A9 2021 Efraim Flashner >> ;;; Copyright =C2=A9 2021 Leo Famulari >> +;;; Copyright =C2=A9 2021 Thomas Albers Raviola >> ;;; >> ;;; This file is part of GNU Guix. >> ;;; >> @@ -24,6 +25,7 @@ >> #:use-module (guix utils) >> #:use-module (guix packages) >> #:use-module (guix download) >> + #:use-module (guix git-download) >> #:use-module ((guix licenses) #:prefix license:) >> #:use-module (guix build-system gnu) >> #:use-module (guix build-system cmake) >> @@ -333,3 +335,67 @@ from ALSA, ESD, and COMEDI sources. This package c= urrently does not include >> support for ESD sources.") >> (home-page "http://xoscope.sourceforge.net/") >> (license license:gpl2+))) >> + >> +(define-public minipro >> + ;; Information needed to fix Makefile >> + (let* ((commit "0774b071361366c866ec97302ec02972379418b0") >> + (commit-short (substring commit 0 8)) >> + ;; git show -s --format=3D"%ci" >> + (date "2021-08-05 07:54:42 +0300") >> + (revision "1")) >> + (package >> + (name "minipro") >> + (version (git-version "0.5" revision commit)) > > [...] > >> + (source >> + (origin >> + (method git-fetch) >> + (uri (git-reference >> + (url "https://gitlab.com/DavidGriffith/minipro.git") >> + (commit commit))) >> + (sha256 >> + (base32 "174m2dwgpxwkm1yrf54p6k5skihgpcd1iblxivg2f6xbdrsz8b18= ")))) >> + (native-inputs >> + `(("pkg-config" ,pkg-config) >> + ("which" ,which) >> + ("sed" ,sed))) >> + (inputs >> + `(("libusb" ,libusb))) > > [...] > >> + (build-system gnu-build-system) >> + (arguments >> + `(#:phases >> + (modify-phases %standard-phases >> + (delete 'configure) >> + (delete 'check) >> + (add-before 'build 'fix-makefile >> + (lambda* (#:key outputs #:allow-other-keys) >> + ;; Modify the makefile so that its 'PREFIX' variable poi= nts to >> + ;; "out". >> + ;; Also fix the folder to where the udev rules are insta= lled and >> + ;; some git related variables that minipro expects. >> + (let ((out (assoc-ref outputs "out"))) >> + (substitute* "Makefile" >> + (("PREFIX \\?=3D .*") >> + (string-append "PREFIX ?=3D " out "\n" )) >> + (("UDEV_DIR=3D.*") >> + (string-append "UDEV_DIR=3D" out "/lib/udev/\n")) >> + (("GIT_BRANCH =3D .*") >> + (string-append "GIT_BRANCH =3D \"master\"\n")) >> + (("GIT_HASH =3D .*") >> + (string-append "GIT_HASH =3D \"" ,commit "\"\n")) >> + (("GIT_HASH_SHORT =3D .*") >> + (string-append "GIT_HASH_SHORT =3D \"" ,commit-shor= t "\"\n")) >> + (("GIT_DATE =3D .*") >> + (string-append "GIT_DATE =3D \"" ,date "\"\n")))) >> + #t))))) > > Upstream has released 0.6 in the meantime, so these fixes will have to be= checked if > they're still needed. In case they are, this part will have to be rewritt= en with G-Expressions. > The dependencies should be restyled as well. > > > I know this a very late reply, but could you send a revised patch for thi= s? (in case you're still maintaining it locally) > > Thanks, > Bruno