From patchwork Sat Jun 12 21:10:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 30191 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 F137F27BC81; Sat, 12 Jun 2021 22:11:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5BE5027BC78 for ; Sat, 12 Jun 2021 22:11:12 +0100 (BST) Received: from localhost ([::1]:52616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsAuN-0001aA-FE for patchwork@mira.cbaines.net; Sat, 12 Jun 2021 17:11:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsAuH-0001Yi-BG for guix-patches@gnu.org; Sat, 12 Jun 2021 17:11:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58865) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsAuE-0001SX-Ns for guix-patches@gnu.org; Sat, 12 Jun 2021 17:11:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsAuE-00080G-K0 for guix-patches@gnu.org; Sat, 12 Jun 2021 17:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48979] [PATCH 1/2] gnu: libngspice: Update to 34. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Jun 2021 21:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48979 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48979@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162353226230759 (code B ref -1); Sat, 12 Jun 2021 21:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jun 2021 21:11:02 +0000 Received: from localhost ([127.0.0.1]:42178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsAuD-0007zz-Hs for submit@debbugs.gnu.org; Sat, 12 Jun 2021 17:11:01 -0400 Received: from lists.gnu.org ([209.51.188.17]:40120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsAuB-0007zr-RV for submit@debbugs.gnu.org; Sat, 12 Jun 2021 17:11:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsAuB-0001YY-55 for guix-patches@gnu.org; Sat, 12 Jun 2021 17:10:59 -0400 Received: from mout02.posteo.de ([185.67.36.66]:53105) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsAu7-0001Jp-Vd for guix-patches@gnu.org; Sat, 12 Jun 2021 17:10:58 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id E46842400E5 for ; Sat, 12 Jun 2021 23:10:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1623532247; bh=sUeDAx0fySrV89X3Jjc/KAtKKLlktasSTqEmP0tPDNs=; h=From:To:Cc:Subject:Date:From; b=MHGKHHuQ7xPEf9kJg6LjKISgUTVrtncOwrlXAUlVjd0zYl4ZQ5J6KzX5HaRXFNxON +UQpHUw0P/9WMfkg6iHd6mVp7yFuEoZUEUHyKiX3SXDV/kuZx//v3NOSWiG0Amet1l 7GeMgAntJwZ4rOmG7rjfcERMy8U4YG4rYn2TC67WWRZq8B2Omhdq7Tjnx4/d6U4odC a6r4HxVbpZW6xnNADIEn4AnfEpb2tpBFav+hhfCgh37/QiouPE3u6jYmzwQz88a00Q ybrOp0GfXTRrwa6AbjQEaj/PgqIZxyCah0ZlpZH+/OTRcRf//17TfJXmMQzz3zvoAA vTp5UMCknct4Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4G2Vjy37J6z6tmG; Sat, 12 Jun 2021 23:10:46 +0200 (CEST) From: Vinicius Monego Date: Sat, 12 Jun 2021 21:10:15 +0000 Message-Id: <20210612211015.784359-1-monego@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=monego@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/engineering.scm (libngspice): Update to 34. [source]: Make some cosmetic changes. [arguments]<#:phases>: Don't return #t. (ngspice)[arguments]<#:phases>: Don't return #t. Remove 'delete-cmpp-dlmain phase because these files are not installed anymore. --- gnu/packages/engineering.scm | 67 +++++++++++++++--------------------- 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 981dd9e5e3..228376480c 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1683,31 +1683,31 @@ high-performance parallel differential evolution (DE) optimization algorithm.") ;; See . (package (name "libngspice") - (version "28") - (source (origin - (method url-fetch) - (uri (list - (string-append "mirror://sourceforge/ngspice/ng-spice-rework/" - version "/ngspice-" version ".tar.gz") - (string-append "mirror://sourceforge/ngspice/ng-spice-rework/" - "old-releases/" version - "/ngspice-" version ".tar.gz"))) - (sha256 - (base32 - "0rnz2rdgyav16w7wfn3sfrk2lwvvgz1fh0l9107zkcldijklz04l")) - (modules '((guix build utils))) - ;; We remove the non-free cider and build without it. - (snippet - '(begin - (delete-file-recursively "src/ciderlib") - (delete-file "src/ciderinit") - (substitute* "configure" - (("src/ciderlib/Makefile") "") - (("src/ciderlib/input/Makefile") "") - (("src/ciderlib/support/Makefile") "") - (("src/ciderlib/oned/Makefile") "") - (("src/ciderlib/twod/Makefile") "")) - #t)))) + (version "34") + (source + (origin + (method url-fetch) + (uri (list + (string-append "mirror://sourceforge/ngspice/ng-spice-rework/" + version "/ngspice-" version ".tar.gz") + (string-append "mirror://sourceforge/ngspice/ng-spice-rework/" + "old-releases/" version + "/ngspice-" version ".tar.gz"))) + (sha256 + (base32 "1dfpkgkwmgwhq8dnbb8dh28cfap6rw0yywkhmxr4jxclcvygyqr2")) + (modules '((guix build utils))) + ;; We remove the non-free cider and build without it. + (snippet + '(begin + (delete-file-recursively "src/ciderlib") + (delete-file "src/ciderinit") + (substitute* "configure" + (("src/ciderlib/Makefile") "") + (("src/ciderlib/input/Makefile") "") + (("src/ciderlib/support/Makefile") "") + (("src/ciderlib/oned/Makefile") "") + (("src/ciderlib/twod/Makefile") "")) + #t)))) (build-system gnu-build-system) (arguments `(;; No tests for libngspice exist. @@ -1718,14 +1718,12 @@ high-performance parallel differential evolution (DE) optimization algorithm.") (add-after 'unpack 'patch-timestamps (lambda _ (substitute* "configure" - (("`date`") "Thu Jan 1 00:00:01 UTC 1970")) - #t)) + (("`date`") "Thu Jan 1 00:00:01 UTC 1970")))) (add-after 'unpack 'delete-program-manuals (lambda _ (substitute* "man/man1/Makefile.in" (("^man_MANS = ngspice\\.1 ngnutmeg\\.1 ngsconvert\\.1 ngmultidec\\.1") - "man_MANS = ")) - #t)) + "man_MANS = ")))) (add-after 'install 'delete-script-files (lambda* (#:key outputs #:allow-other-keys) (delete-file-recursively @@ -1768,16 +1766,7 @@ an embedded event driven algorithm.") (lambda _ (substitute* "src/Makefile.in" (("^SUBDIRS = misc maths frontend spicelib include/ngspice") - "SUBDIRS = misc maths frontend spicelib")) - #t)) - (add-after 'install 'delete-cmpp-dlmain - (lambda* (#:key outputs #:allow-other-keys) - (for-each (lambda (file) - (delete-file - (string-append (assoc-ref outputs "out") - file))) - '("/bin/cmpp" "/share/ngspice/dlmain.c")) - #t)) + "SUBDIRS = misc maths frontend spicelib")))) (delete 'delete-program-manuals) (delete 'delete-script-files))))) (inputs From patchwork Sat Jun 12 21:11:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 30192 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 0E06727BC81; Sat, 12 Jun 2021 22:13:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C22E427BC78 for ; Sat, 12 Jun 2021 22:13:08 +0100 (BST) Received: from localhost ([::1]:52862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsAwF-0001nd-Jb for patchwork@mira.cbaines.net; Sat, 12 Jun 2021 17:13:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsAwA-0001nU-SF for guix-patches@gnu.org; Sat, 12 Jun 2021 17:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58870) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsAwA-0002ji-L6 for guix-patches@gnu.org; Sat, 12 Jun 2021 17:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsAwA-00083b-Eq for guix-patches@gnu.org; Sat, 12 Jun 2021 17:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48979] [PATCH 2/2] gnu: libngspice: Enable ciderlib. References: <20210612211015.784359-1-monego@posteo.net> In-Reply-To: <20210612211015.784359-1-monego@posteo.net> Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Jun 2021 21:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48979 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48979@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 48979-submit@debbugs.gnu.org id=B48979.162353233230905 (code B ref 48979); Sat, 12 Jun 2021 21:13:02 +0000 Received: (at 48979) by debbugs.gnu.org; 12 Jun 2021 21:12:12 +0000 Received: from localhost ([127.0.0.1]:42183 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsAvL-00082O-1T for submit@debbugs.gnu.org; Sat, 12 Jun 2021 17:12:11 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33121) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsAvJ-000828-Pp for 48979@debbugs.gnu.org; Sat, 12 Jun 2021 17:12:10 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 1F309240026 for <48979@debbugs.gnu.org>; Sat, 12 Jun 2021 23:12:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1623532323; bh=/4PDxQ1st8qVgPSEaq/50CTtfZ7obmXCJfJnVeoIKh0=; h=From:To:Cc:Subject:Date:From; b=CgcJRULsrnCSM+PMmg2X1FzJx02r9KqJSMCPPyxewbJmd1DFQIq5sP65lZy9IPYVZ 6TASpffk8Pc4YtQYmsFpv8gawS0To7nexUyXGatKh7vag+zCLO0q7/A+vIUpPgWjn0 iTY109Nb7thZRhAxanuoCVPlY+qeHBlsvClsWl7yA6NN4BzZU3Ef/SQ7r2KGUIT4Ne wG8MQOj+7VYmN5l+sPc6Wt1SKJ2hhX7t1PdBBTrUs2eT1LHkESyC3HfJXXWYMZMzcl z1IchxTNuGWhuCkpjCnFDISwqYH3KAh7F6+VxlksuFstA1eY40F9KhYeN+UoNpsw10 v+IdfWzm2IUBw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4G2VlP48LLz9rxQ; Sat, 12 Jun 2021 23:12:01 +0200 (CEST) From: Vinicius Monego Date: Sat, 12 Jun 2021 21:11:40 +0000 Message-Id: <20210612211140.784567-1-monego@posteo.net> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/engineering.scm (libngspice)[source]: Remove snippet that deleted ciderlib. [arguments]: Pass "--enable-ciderlib" to #:configure-flags. [license]: Add license for ciderlib. --- ngspice announced that it is DFSG-compatible since version 28 (June 1st 2018): http://ngspice.sourceforge.net/news.html I had a look at the Debian copyright file and ciderlib is marked as bsd-3. I am adding this license to the list then: https://sources.debian.org/src/ngspice/34+ds-1/debian/copyright/ gnu/packages/engineering.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 228376480c..0e9e647ec9 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1694,20 +1694,7 @@ high-performance parallel differential evolution (DE) optimization algorithm.") "old-releases/" version "/ngspice-" version ".tar.gz"))) (sha256 - (base32 "1dfpkgkwmgwhq8dnbb8dh28cfap6rw0yywkhmxr4jxclcvygyqr2")) - (modules '((guix build utils))) - ;; We remove the non-free cider and build without it. - (snippet - '(begin - (delete-file-recursively "src/ciderlib") - (delete-file "src/ciderinit") - (substitute* "configure" - (("src/ciderlib/Makefile") "") - (("src/ciderlib/input/Makefile") "") - (("src/ciderlib/support/Makefile") "") - (("src/ciderlib/oned/Makefile") "") - (("src/ciderlib/twod/Makefile") "")) - #t)))) + (base32 "1dfpkgkwmgwhq8dnbb8dh28cfap6rw0yywkhmxr4jxclcvygyqr2")))) (build-system gnu-build-system) (arguments `(;; No tests for libngspice exist. @@ -1731,6 +1718,7 @@ high-performance parallel differential evolution (DE) optimization algorithm.") "/share/ngspice/scripts"))))) #:configure-flags (list "--enable-openmp" + "--enable-ciderlib" "--enable-xspice" "--with-ngshared" "--with-readline=yes"))) @@ -1750,6 +1738,7 @@ provides code modeling support and simulation of digital components through an embedded event driven algorithm.") (license (list license:lgpl2.0+ ; code in frontend/numparam (license:non-copyleft "file:///COPYING") ; spice3 bsd-style + license:bsd-3 ; ciderlib license:public-domain)))) ; xspice (define-public ngspice