Message ID | 1f03c394302b446798f46d1e1495ca1367a7cdb4.1745585324.git.csantosb@inventati.org |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1BDD527BC4B; Fri, 25 Apr 2025 13:53:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 CFE5D27BC49 for <patchwork@mira.cbaines.net>; Fri, 25 Apr 2025 13:53:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1u8IYI-0000kM-Dn; Fri, 25 Apr 2025 08:53:10 -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 <Debian-debbugs@debbugs.gnu.org>) id 1u8IYC-0000it-6o for guix-patches@gnu.org; Fri, 25 Apr 2025 08:53:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1u8IYB-0007de-Nc for guix-patches@gnu.org; Fri, 25 Apr 2025 08:53:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=Wg4PYi34YpOpG0sdfuME2vZbq2zac/IdADPAFK9/tS0=; b=sHeP3qX9VqOejPWbZ4HCPNKtxCsxWp8kOqMJzvDMN2KiOdZmL4V3jVe8jUzKHwX7Ai16fN6eGjLm6npJKU9hSOEgnbW7HwZ0Dbsov6mk+625pyWPmiMkfCmwQMUKq5PIeoChcxv7Hq2q7h3sMdGARkQLT7z2a4Ku9grFcG5ZKEf68XQY9KWEA8NBEqZTLvWuWKf+oP/jGHGM4KSCYWyw2f+XF4Anh5togNJtNy3Mk3Qc85is6Oc/0J49iL1l8kJ8DuLFoveOBSN5t/Sj7u06C0RxKcN1sand+Mjm//wyEUn5Vx2yyG/loP87x4nNOraRY9U+YqtVJEQRe9WWsYDpUg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1u8IYA-0001Ww-Fb; Fri, 25 Apr 2025 08:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78059] [PATCH electronics-team] gnu: Add abc-yosyshq. Resent-From: Cayetano Santos <csantosb@inventati.org> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: csantosb@inventati.org, ekaitz@elenq.tech, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 25 Apr 2025 12:53:02 +0000 Resent-Message-ID: <handler.78059.B.17455855695843@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78059 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78059@debbugs.gnu.org Cc: Cayetano Santos <csantosb@inventati.org>, Cayetano Santos <csantosb@inventati.org>, Ekaitz Zarraga <ekaitz@elenq.tech>, Maxim Cournoyer <maxim.cournoyer@gmail.com> X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Cayetano Santos <csantosb@inventati.org>, Ekaitz Zarraga <ekaitz@elenq.tech>, Maxim Cournoyer <maxim.cournoyer@gmail.com> Received: via spool by submit@debbugs.gnu.org id=B.17455855695843 (code B ref -1); Fri, 25 Apr 2025 12:53:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Apr 2025 12:52:49 +0000 Received: from localhost ([127.0.0.1]:48716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1u8IXx-0001WA-0y for submit@debbugs.gnu.org; Fri, 25 Apr 2025 08:52:49 -0400 Received: from lists.gnu.org ([2001:470:142::17]:47856) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <csantosb@inventati.org>) id 1u8IXu-0001Vg-4E for submit@debbugs.gnu.org; Fri, 25 Apr 2025 08:52:46 -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 <csantosb@inventati.org>) id 1u8IXo-0000dC-ON for guix-patches@gnu.org; Fri, 25 Apr 2025 08:52:40 -0400 Received: from confino.investici.org ([2a11:7980:1::2:0]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <csantosb@inventati.org>) id 1u8IXm-0007bq-D0 for guix-patches@gnu.org; Fri, 25 Apr 2025 08:52:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1745585553; bh=Wg4PYi34YpOpG0sdfuME2vZbq2zac/IdADPAFK9/tS0=; h=From:To:Cc:Subject:Date:From; b=lwN6+PyLXhX4E2RYqAe+uIz3gMC2EqBPYZCtCsG5hD9uHJkFp/Eh9v13HmY9bPw3P /QLZYmp+N82FnaZRRVXIQugchY15lL3ZuwBmxl29skUBaO/RJXXT3hCXoyKqaqpeLL C2H4N/EYMNzf6e29WChxvGgFwD42U/WnVZhzSBdI= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4ZkXmx2FGyz11DN; Fri, 25 Apr 2025 12:52:33 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4ZkXmx10Xqz11D7; Fri, 25 Apr 2025 12:52:33 +0000 (UTC) Date: Fri, 25 Apr 2025 14:48:44 +0200 Message-ID: <1f03c394302b446798f46d1e1495ca1367a7cdb4.1745585324.git.csantosb@inventati.org> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a11:7980:1::2:0; envelope-from=csantosb@inventati.org; helo=confino.investici.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Reply-to: Cayetano Santos <csantosb@inventati.org> X-ACL-Warn: , Cayetano Santos via Guix-patches <guix-patches@gnu.org> From: Cayetano Santos via Guix-patches via <guix-patches@gnu.org> 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 |
Series |
[bug#78059,electronics-team] gnu: Add abc-yosyshq.
|
|
Commit Message
Cayetano Santos
April 25, 2025, 12:48 p.m. UTC
* gnu/packages/fpga.scm (abc-yosyshq): New variable. https://github.com/YosysHQ/abc is a fork of berkeley abc, used by all yosyshq projects (yosys, etc.). Change-Id: I46649e3722ded3faf8c0993d7bebaf649e6297c6 --- There are (at least) two versions of abc: - https://github.com/berkeley-abc/abc, from berkely, that we currently package - https://github.com/YosysHQ/abc, a fork by yosyshq Yosys and remaining yosyshq software we package uses the later, while we are using the former. This produces errors in tests. We need then to package yosyshq version so that we may use it with all of their packages. gnu/packages/fpga.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) base-commit: 501a9603f5e3cda07f3be8e7fecac31f7af5ce52 -- 2.49.0
Comments
Hi Cayetano,, Cayetano Santos <csantosb@inventati.org> writes: > * gnu/packages/fpga.scm (abc-yosyshq): New variable. > > https://github.com/YosysHQ/abc is a fork of berkeley abc, used by all > yosyshq projects (yosys, etc.). [...] > +(define-public abc-yosyshq > + (package > + (name "abc-yosyshq") > + (version "0.52") > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/YosysHQ/abc/") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "15a7nyk8iqpadp326icnr7rn5pwq44b9lvajqc35hcsvixz4gxsa")))) > + (build-system gnu-build-system) > + (inputs > + (list readline)) > + (arguments > + (list > + #:license-file-regexp "copyright.txt" > + #:tests? #f ; no tests > + #:phases > + #~(modify-phases %standard-phases > + (delete 'configure) > + (replace 'install > + (lambda _ > + (install-file "abc" (string-append #$output "/bin"))))))) > + (home-page "https://github.com/YosysHQ/abc/") > + (synopsis "Sequential logic synthesis and formal verification") > + (description "ABC is a program for sequential logic synthesis and > +formal verification.") > + (license > + (license:non-copyleft > + "https://people.eecs.berkeley.edu/~alanmi/abc/copyright.htm")))) Since that's almost a 1:1 copy of the original definition, inheritance is most appropriate: --8<---------------cut here---------------start------------->8--- modified gnu/packages/fpga.scm @@ -118,6 +118,24 @@ (define-public abc (license:non-copyleft "https://people.eecs.berkeley.edu/~alanmi/abc/copyright.htm"))))) +(define-public abc-yosyshq + (package + (inherit abc) + (name "abc-yosyshq") + (version "0.52") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/YosysHQ/abc/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15a7nyk8iqpadp326icnr7rn5pwq44b9lvajqc35hcsvixz4gxsa")))) + (home-page "https://github.com/YosysHQ/abc/") + (description "ABC is a program for sequential logic synthesis and +formal verification. This is the Yosyshq fork of ABC."))) + (define-public iverilog (package (name "iverilog") @@ -158,40 +176,6 @@ (define-public iverilog ;; You have to accept both GPL2 and LGPL2.1+. (license (list license:gpl2 license:lgpl2.1+)))) -(define-public abc-yosyshq - (package - (name "abc-yosyshq") - (version "0.52") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/YosysHQ/abc/") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15a7nyk8iqpadp326icnr7rn5pwq44b9lvajqc35hcsvixz4gxsa")))) - (build-system gnu-build-system) - (inputs - (list readline)) - (arguments - (list - #:license-file-regexp "copyright.txt" - #:tests? #f ; no tests - #:phases - #~(modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda _ - (install-file "abc" (string-append #$output "/bin"))))))) - (home-page "https://github.com/YosysHQ/abc/") - (synopsis "Sequential logic synthesis and formal verification") - (description "ABC is a program for sequential logic synthesis and -formal verification.") - (license - (license:non-copyleft - "https://people.eecs.berkeley.edu/~alanmi/abc/copyright.htm")))) - (define-public yosys (package (name "yosys") --8<---------------cut here---------------end--------------->8--- Unfortunately, reading the README to see if I could expound the description a bit with the fork's extra features, I read: --8<---------------cut here---------------start------------->8--- The source code is provided for research and evaluation only. For commercial usage, please contact Prof. Chang Wu at wuchang@fudan.edu.cn. --8<---------------cut here---------------end--------------->8--- So, sadly, it seems this fork is derived from another fork which contains non-free additions... and that's a valid thing to do because of the permissive license of the original work. It sucks, but it looks like we won't be able to carry this in our repository. It should probably be reported to the yosys project, but it seems the bug tracker is disabled on their github repo. I'll let you do it if you don't mind.
>ven. 02 mai 2025 at 16:03, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote: > So, sadly, it seems this fork is derived from another fork which > contains non-free additions... and that's a valid thing to do because of > the permissive license of the original work. > > It sucks, but it looks like we won't be able to carry this in our > repository. Notice that we already package in Guix the original abc code from Berkeley, also for research and evaluation only, see "gnu packages fpga" module. And this is the abc used by yosys and yosys-clang, both in the same module. C.
Ok, so after asking people on YosysHq, we have this situation: - berkeley-abc/abc :: original project; the one currently packaged in guix, licensed under: https://people.eecs.berkeley.edu/~alanmi/abc/copyright.htm - YosysHQ/abc :: fork of the original; licensed under https://github.com/YosysHQ/abc/blob/yosys-experimental/copyright.txt - yongshiwo/abc :: fork of the original, including new Agdmap; only in this case the "for research and evaluation only" applies Current patch concerns YosysHQ/abc version above. C.
Hi Cayetano, Cayetano Santos <csantosb@inventati.org> writes: >>ven. 02 mai 2025 at 16:03, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote: > >> So, sadly, it seems this fork is derived from another fork which >> contains non-free additions... and that's a valid thing to do because of >> the permissive license of the original work. >> >> It sucks, but it looks like we won't be able to carry this in our >> repository. > > Notice that we already package in Guix the original abc code from > Berkeley, also for research and evaluation only, see "gnu packages fpga" > module. And this is the abc used by yosys and yosys-clang, both in the > same module. Thanks for pointing this; I thought that wording was something new introduced in a fork, but you are correct, it's been there all along. I've done due diligence, and found that Debian carries the same source/package as part of their 'yosys' source package [0], and it had been added in 2015 in the Free Software Directory [1] I've now pushed a reworked version in 64ab31870c6. Curiously, the test suite of symbiyosys still fails if I comment out the phase disabling the problematic tests. Could you take a look? [0] https://metadata.ftp-master.debian.org/changelogs//main/y/yosys/yosys_0.52-1_copyright [1] https://directory.fsf.org/wiki/ABC#tab=Details
>ven. 02 mai 2025 at 21:48, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote: > I've now pushed a reworked version in 64ab31870c6. Curiously, the test > suite of symbiyosys still fails if I comment out the phase disabling the > problematic tests. Could you take a look? Sure. We first need to fix Yosys itself, see #78214; then, we’ll proceed similarly with Symbiyosys. C.
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index e1043efc48..a98bca8578 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -156,6 +156,40 @@ (define-public iverilog ;; You have to accept both GPL2 and LGPL2.1+. (license (list license:gpl2 license:lgpl2.1+)))) +(define-public abc-yosyshq + (package + (name "abc-yosyshq") + (version "0.52") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/YosysHQ/abc/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15a7nyk8iqpadp326icnr7rn5pwq44b9lvajqc35hcsvixz4gxsa")))) + (build-system gnu-build-system) + (inputs + (list readline)) + (arguments + (list + #:license-file-regexp "copyright.txt" + #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda _ + (install-file "abc" (string-append #$output "/bin"))))))) + (home-page "https://github.com/YosysHQ/abc/") + (synopsis "Sequential logic synthesis and formal verification") + (description "ABC is a program for sequential logic synthesis and +formal verification.") + (license + (license:non-copyleft + "https://people.eecs.berkeley.edu/~alanmi/abc/copyright.htm")))) + (define-public yosys (package (name "yosys")