From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id yIKqGcTAJmQecgEASxT56A (envelope-from ) for ; Fri, 31 Mar 2023 13:15: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 mp11.migadu.com with LMTPS id aMihGcTAJmQcTgEA9RJhRA (envelope-from ) for ; Fri, 31 Mar 2023 13:15: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 C516343901 for ; Fri, 31 Mar 2023 13:15:15 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piCiq-0007hz-Rz; Fri, 31 Mar 2023 07:15:09 -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 1piCik-0007hj-Qr for guix-patches@gnu.org; Fri, 31 Mar 2023 07:15: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 1piCik-0005Ed-DB for guix-patches@gnu.org; Fri, 31 Mar 2023 07:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1piCij-00038d-MV for guix-patches@gnu.org; Fri, 31 Mar 2023 07:15:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50578] [PATCH] gnu: Add minipro Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Mar 2023 11:15: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: Thomas Albers Cc: 50578@debbugs.gnu.org Received: via spool by 50578-submit@debbugs.gnu.org id=B50578.168026127712011 (code B ref 50578); Fri, 31 Mar 2023 11:15:01 +0000 Received: (at 50578) by debbugs.gnu.org; 31 Mar 2023 11:14:37 +0000 Received: from localhost ([127.0.0.1]:60505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piCiK-00037e-GJ for submit@debbugs.gnu.org; Fri, 31 Mar 2023 07:14:36 -0400 Received: from smtpmciv1.myservices.hosting ([185.26.107.237]:46676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piCiH-00037P-Pt for 50578@debbugs.gnu.org; Fri, 31 Mar 2023 07:14:35 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv1.myservices.hosting (Postfix) with ESMTP id 7251A207FC; Fri, 31 Mar 2023 13:14:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 990A48009F; Fri, 31 Mar 2023 13:09:10 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 189gVMqAUv1Z; Fri, 31 Mar 2023 13:09:09 +0200 (CEST) Received: from [192.168.1.239] (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 03F4F8009D; Fri, 31 Mar 2023 13:09:08 +0200 (CEST) Message-ID: <617becc9-a8c6-e269-fb14-4c7e5178ef0b@makinata.eu> Date: Fri, 31 Mar 2023 12:09:00 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Content-Language: en-US References: <20210914105601.12562-1-thomas@thomaslabs.org> From: Bruno Victal In-Reply-To: <20210914105601.12562-1-thomas@thomaslabs.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-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=1680261316; a=rsa-sha256; cv=none; b=rZW1kwlqbIX4gGmjjM9YSmclAbP668nHPbI6/42/izkNjPOZJKp3cgerMdkYhzsHcJF5ZI /V9hOfSP1XZQoiIiyyZ6JLeUDVLP0etKuVd7b5KENK+Jnvr61F8N4MnhbMo6ofaToMfD7z FO68LFa2LJi6IFTLHwsQRmhJWgVjzG+3dms5jFhcbebMHTpVmGHgeuvsqYypRNSPlfzx0g SqqnuKgB6jvkrxXbdZ0JnyCw0y0lVDXNcMpeNOmkQwlsQRcvaucyQOabFqLEAuB/aJhnUQ iTijqN9NKtCB+6jhCo4+yAOiHLM3+pY7PUI5cHV0+9e7X2cW2gWEgLJdlz/ZOg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680261316; 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: 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; bh=vPcuci7zPS07oTZb5oAXDiey8gT3CksHQJXkk0aIQ0Y=; b=M5f+nYyv9f2n5QBNKp+ttFQyFwjPcW8WVe68Sx/NdIHKXxOVEgc4MaJBVGLk8H8KLhBzja aCU+isfVoPb3J9C6+yBmnkMdp2vZpGY2M1RIqwofBxq0wOTWkIRNBPo3YNYccIBR441peg B6jMcvomFzdbeQctlDvN7mbBlr9EWo4DXNCEiBUvs8zqlmEHEG6SapJHHVOrHYaWMYIstu 0ue+p1KJ3gXtKp8TTWnRJZ6mF1nhd7ftwB2ceSejzD65Iq6fcsumZUXbD8ySrXGvis2XEo Q9NEV3qLnL8+qnhTJHGtFEbxDrarY9CyElc7RiIGnusP7XsTfwYp4zQ9QiqneA== Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -4.52 X-Spam-Score: -4.52 X-Migadu-Queue-Id: C516343901 X-TUID: AtroK+6MGIBw 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(+) > > 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 © 2019 Clément Lassieur > ;;; Copyright © 2021 Efraim Flashner > ;;; Copyright © 2021 Leo Famulari > +;;; Copyright © 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 currently 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="%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 points to > + ;; "out". > + ;; Also fix the folder to where the udev rules are installed and > + ;; some git related variables that minipro expects. > + (let ((out (assoc-ref outputs "out"))) > + (substitute* "Makefile" > + (("PREFIX \\?= .*") > + (string-append "PREFIX ?= " out "\n" )) > + (("UDEV_DIR=.*") > + (string-append "UDEV_DIR=" out "/lib/udev/\n")) > + (("GIT_BRANCH = .*") > + (string-append "GIT_BRANCH = \"master\"\n")) > + (("GIT_HASH = .*") > + (string-append "GIT_HASH = \"" ,commit "\"\n")) > + (("GIT_HASH_SHORT = .*") > + (string-append "GIT_HASH_SHORT = \"" ,commit-short "\"\n")) > + (("GIT_DATE = .*") > + (string-append "GIT_DATE = \"" ,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 rewritten 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 this? (in case you're still maintaining it locally) Thanks, Bruno