From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55036) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dyQHq-0006b2-MJ for guix-patches@gnu.org; Sat, 30 Sep 2017 18:31:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dyQHm-0005vu-M9 for guix-patches@gnu.org; Sat, 30 Sep 2017 18:31:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:32896) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dyQHm-0005vc-Iz for guix-patches@gnu.org; Sat, 30 Sep 2017 18:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dyQHm-0004RP-70 for guix-patches@gnu.org; Sat, 30 Sep 2017 18:31:02 -0400 Subject: [bug#27344] [PATCH v3 8/8] gnu: Add qucs-s. Resent-Message-ID: References: <87lglnery8.fsf@foradis.org> <20170909175752.8566-1-theodoros@foradis.org> <20170909175752.8566-8-theodoros@foradis.org> From: Theodoros Foradis In-reply-to: <20170909175752.8566-8-theodoros@foradis.org> Date: Sun, 01 Oct 2017 01:30:10 +0300 Message-ID: <87o9prhlal.fsf@foradis.org> MIME-Version: 1.0 Content-Type: text/plain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27344@debbugs.gnu.org Having run "guix lint" before formatting the patches, I split some lines in two, and that caused some text substitutions to fail in qucs-s package, which I did not catch in time. This patch (applied on top of [PATCH v3 8/8] gnu: Add qucs-s.) resolves the issue. If it is preferred that I send the whole patch again, please ask. diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 25221369f..74000e948 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1598,16 +1598,16 @@ e.g. DC, AC, S-parameter, Transient, Noise and Harmonic Balance analysis. (add-after 'patch-scripts 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "qucs/main.cpp" - (("QucsSettings\\.Qucsator = QucsSettings\\.BinDir - \\+ \"qucsator\" \\+ executableSuffix") + (((string-append "QucsSettings\\.Qucsator = QucsSettings\\.BinDir " + "\\+ \"qucsator\" \\+ executableSuffix")) (string-append "}{ QucsSettings.Qucsator = \"" (assoc-ref inputs "qucs") "/bin/qucsator\"")) - (("else QucsSettings\\.XyceExecutable = - \"/usr/local/Xyce-Release-6.2.0-OPENSOURCE/bin/runxyce") + (((string-append "else QucsSettings\\.XyceExecutable = " + "\"/usr/local/Xyce-Release-6.2.0-OPENSOURCE/bin/runxyce")) (string-append "QucsSettings.XyceExecutable = \"" (assoc-ref inputs "xyce-serial") "/bin/Xyce")) - (("else QucsSettings\\.XyceParExecutable = - \"/usr/local/Xyce-Release-6.2.0-OPENMPI-OPENSOURCE/bin/xmpirun") + (((string-append "else QucsSettings\\.XyceParExecutable = \"/usr/local" + "/Xyce-Release-6.2.0-OPENMPI-OPENSOURCE/bin/xmpirun")) (string-append "QucsSettings.XyceParExecutable = \"" (assoc-ref inputs "mpi") "/bin/mpirun")) (("%p") -- Theodoros Foradis