From unknown Sat Jun 21 12:16:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#37435] [PATCH 2/2] gnu: idris: Update to 1.3.2. Resent-From: ericbavier@centurylink.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Sep 2019 03:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37435 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37435@debbugs.gnu.org Cc: Eric Bavier X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15686914362713 (code B ref -1); Tue, 17 Sep 2019 03:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Sep 2019 03:37:16 +0000 Received: from localhost ([127.0.0.1]:51451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iA4Ig-0000ha-8D for submit@debbugs.gnu.org; Mon, 16 Sep 2019 23:37:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:47362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iA4IZ-0000hM-Ai for submit@debbugs.gnu.org; Mon, 16 Sep 2019 23:37:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50906) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iA4IX-0006z4-OV for guix-patches@gnu.org; Mon, 16 Sep 2019 23:37:03 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: *** X-Spam-Status: No, score=3.6 required=5.0 tests=BAYES_50,FREEMAIL_FROM, KHOP_HELO_FCRDNS,SPOOFED_FREEMAIL,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iA4IW-0004TK-2l for guix-patches@gnu.org; Mon, 16 Sep 2019 23:37:01 -0400 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:5206 helo=smtp.centurylink.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iA4IV-0004Rz-UE for guix-patches@gnu.org; Mon, 16 Sep 2019 23:37:00 -0400 DKIM-Signature: v=1; a=rsa-sha1; d=centurylink.net; s=ctl201402; c=relaxed/simple; q=dns/txt; i=@centurylink.net; t=1568691419; h=From:Subject:Date:To:MIME-Version; bh=w9dbhvDgxWduH8QuWZPgaAf3q+c=; b=1QA2uTIVCEHA5ostvY8q/8wTpxzSacj5FeOCtcW4n9vRs30wE861KVLGynDnC/Ce 7vzQV8a/Oq98qr2CcMIPFy5KpY0u6Ygctdw3ALkTzczrf8XjOv9YvYDKvVIBJKjz Xk6e8wiLrFrZL4Es3O4+EvjAQhEHQ0tfVdXE9g8KHPhLt4yHegzUX4BLC4jBv4EQ 9d5JQGHafqrRTdXBWuJvGvNRofdaPEYNzl4bOHTvz5fHpSR7h8B5yESpqy+lWhnZ v1DyIxPJQFArsjHNRAoDMUKNM2sx85TnxGcZmeW74d1fwXGSBEU9zDQIYPXn4iGg cnNkZufFZJJowP2TarlesA==; X_CMAE_Category: , , X-CNFS-Analysis: v=2.3 cv=fqKim2wf c=1 sm=1 tr=0 a=GVJ9LTFkbBq9teHl4Ync7A==:117 a=GVJ9LTFkbBq9teHl4Ync7A==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=KGjhK52YXX0A:10 a=J70Eh1EUuV4A:10 a=zSv6zi-ZgakA:10 a=eQrCS-SpgXYA:10 a=inoG4m36AAAA:8 a=JqsHG6aPAAAA:8 a=bCN-XRSCAAAA:8 a=z6RlEaGRQXJI5Tz_PNAA:9 a=_Qgj-RFg6mImvLaOgLPg:22 a=qfbbBrErdq5vOlahl-QS:22 a=VFraTkD3lrpmuGUt5nhW:22 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine Feedback-ID: dfw:ctl:res:onyx X-Authed-Username: ZXJpY2JhdmllckBjZW50dXJ5bGluay5uZXQ= Authentication-Results: smtp04.onyx.dfw.sync.lan smtp.user=ericbavier@centurylink.net; auth=pass (LOGIN) Received: from [65.128.96.128] ([65.128.96.128:59530] helo=localhost.localdomain) by smtp.centurylink.net (envelope-from ) (ecelerity 3.6.25.56547 r(Core:3.6.25.0)) with ESMTPSA (cipher=DHE-RSA-AES128-GCM-SHA256) id E9/86-30260-BD4508D5; Mon, 16 Sep 2019 23:36:59 -0400 From: ericbavier@centurylink.net Date: Mon, 16 Sep 2019 22:37:30 -0500 Message-Id: <20190917033730.28806-2-ericbavier@centurylink.net> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190917033730.28806-1-ericbavier@centurylink.net> References: <20190917033730.28806-1-ericbavier@centurylink.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 206.152.134.66 X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) From: Eric Bavier * gnu/packages/idris.scm (ghc-network-2.8): New variable. (idris): Update to 1.3.2. [source]: Remove patch. [inputs]: Use ghc-network-2.8. * gnu/packages/patches/idris-test-no-node.patch: Delete. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/idris.scm | 24 ++++++-- gnu/packages/patches/idris-test-no-node.patch | 61 ------------------- 3 files changed, 20 insertions(+), 66 deletions(-) delete mode 100644 gnu/packages/patches/idris-test-no-node.patch diff --git a/gnu/local.mk b/gnu/local.mk index 16b63bc951..4beee88e38 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -946,7 +946,6 @@ dist_patch_DATA = \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ - %D%/packages/patches/idris-test-no-node.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 4290d8c21f..376db9cb05 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -35,10 +35,27 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages)) +;;; Until we update our default GHC to >=8.6 we cannot update our ghc-network +;;; package, since the 'cabal-install' package that supports the current +;;; 'Cabal' module requires 'network==2.6.*'. Providing a local ghc-network +;;; works in this case since we use it only for a standalone program. +(define ghc-network-2.8 + (package + (inherit ghc-network) + (version "2.8.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/network/" + "network-" version ".tar.gz")) + (sha256 + (base32 + "0im8k51rw3ahmr23ny10pshwbz09jfg0fdpam0hzf2hgxnzmvxb1")))))) + (define-public idris (package (name "idris") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (string-append @@ -46,8 +63,7 @@ "idris-" version "/idris-" version ".tar.gz")) (sha256 (base32 - "0fn9h58l592j72njwma1ia48h8h87wi2rjqfxs7j2lfmvgfv18fi")) - (patches (search-patches "idris-test-no-node.patch")))) + "0wychzkg0yghd2pp8fqz78vp1ayzks191knfpl7mhh8igsmb6bc7")))) (build-system haskell-build-system) (native-inputs ;For tests `(("perl" ,perl) @@ -72,7 +88,7 @@ ("ghc-ieee754" ,ghc-ieee754) ("ghc-libffi" ,ghc-libffi) ("ghc-megaparsec" ,ghc-megaparsec) - ("ghc-network" ,ghc-network) + ("ghc-network" ,ghc-network-2.8) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-safe" ,ghc-safe) diff --git a/gnu/packages/patches/idris-test-no-node.patch b/gnu/packages/patches/idris-test-no-node.patch deleted file mode 100644 index c04ad41a8e..0000000000 --- a/gnu/packages/patches/idris-test-no-node.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 6c52e1b902b869c25e2fe39cff6364143a04da61 Mon Sep 17 00:00:00 2001 -From: Niklas Larsson -Date: Tue, 11 Dec 2018 19:56:22 +0100 -Subject: [PATCH] Only check for Node when required - ---- - test/TestRun.hs | 34 ++++++++++++++++++++-------------- - 1 file changed, 20 insertions(+), 14 deletions(-) - -diff --git a/test/TestRun.hs b/test/TestRun.hs -index c7db9fdcd..4809911f3 100644 ---- a/test/TestRun.hs -+++ b/test/TestRun.hs -@@ -11,6 +11,7 @@ import Data.Proxy - import Data.Typeable - import Options.Applicative - import System.Directory -+import System.Environment - import System.Exit - import System.FilePath (()) - import System.Info -@@ -103,20 +104,25 @@ runTest path flags = do - normalise (x : xs) = x : normalise xs - normalise [] = [] - -+checkNode :: IO () -+checkNode = do -+ nodePath <- findExecutable "node" -+ nodejsPath <- findExecutable "nodejs" -+ let node = nodePath <|> nodejsPath -+ case node of -+ Nothing -> do -+ putStrLn "For running the test suite against Node, node must be installed." -+ exitFailure -+ Just _ -> return () -+ - main :: IO () - main = do -- nodePath <- findExecutable "node" -- nodejsPath <- findExecutable "nodejs" -- let node = nodePath <|> nodejsPath -- case node of -- Nothing -> do -- putStrLn "For running the test suite against Node, node must be installed." -- exitFailure -- Just _ -> do -- defaultMainWithIngredients ingredients $ -+ args <- getArgs -+ when ("--node" `elem` args) checkNode -+ defaultMainWithIngredients ingredients $ - askOption $ \(NodeOpt node) -> -- let (codegen, flags) = if node then (JS, ["--codegen", "node"]) -- else (C , []) -- in -- mkGoldenTests (testFamiliesForCodegen codegen) -- (flags ++ idrisFlags) -+ let (codegen, flags) = if node then (JS, ["--codegen", "node"]) -+ else (C , []) -+ in -+ mkGoldenTests (testFamiliesForCodegen codegen) (flags ++ idrisFlags) -+ -- 2.23.0 From unknown Sat Jun 21 12:16:56 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: ericbavier@centurylink.net Subject: bug#37435: closed (Re: [bug#37434] [PATCH 1/2] gnu: ghc-megaparsec: Update to 7.0.5.) Message-ID: References: <1530026973.36474811.1569378028367.JavaMail.zimbra@centurylink.net> <20190917033730.28806-2-ericbavier@centurylink.net> X-Gnu-PR-Message: they-closed 37435 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 37435@debbugs.gnu.org Date: Wed, 25 Sep 2019 02:21:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1569378063-15880-1" This is a multi-part message in MIME format... ------------=_1569378063-15880-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #37435: [PATCH 2/2] gnu: idris: Update to 1.3.2. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 37435@debbugs.gnu.org. --=20 37435: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D37435 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1569378063-15880-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 37435-done) by debbugs.gnu.org; 25 Sep 2019 02:20:37 +0000 Received: from localhost ([127.0.0.1]:40694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iCwuy-00046f-Fz for submit@debbugs.gnu.org; Tue, 24 Sep 2019 22:20:37 -0400 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:51955 helo=smtp.centurylink.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iCwuw-00046I-IQ for 37435-done@debbugs.gnu.org; Tue, 24 Sep 2019 22:20:34 -0400 DKIM-Signature: v=1; a=rsa-sha1; d=centurylink.net; s=ctl201402; c=relaxed/simple; q=dns/txt; i=@centurylink.net; t=1569378028; h=From:Subject:Date:To:MIME-Version:Content-Type; bh=/eCfv/lUE8cmcf0vRe63iJ21OXU=; b=1xfl0+pht8AF4sblRh7ZBNwLepxRhf/pi9tighNRiKiRmfKk3xOQc1glydjdYhit IUg1IH7jP5WZ3TIQ1A+3Hj65JPm3iQcY/2+Es89dYYp0lyr2AtISgJn5OrK1lHP2 p3pL2EqicYB0p45EWLTX1f9rlUF54qT3LXu49ih4A+BijDnE9PXesAyoI24CFM+j jX2YOHcY9GUOwOsqTbpKRekl2Jp2tq5hba0IB5EloXwxPAUbeSCxnhnbGAz+LjBx hNUs/TcY5kI1zQKCCneyK488I/Qo84THFJAI8DuSqppV/14d4MxstGH2InVKmugJ 3YNIzbuE3aM40oq8EHPnsQ==; X_CMAE_Category: , , X-CNFS-Analysis: v=2.3 cv=b67MHeOx c=1 sm=1 tr=0 a=RJvREvjeJyUEoUsE7e+N5w==:117 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=KGjhK52YXX0A:10 a=FKkrIqjQGGEA:10 a=OKXshHjYWGYA:10 a=IkcTkHD0fZMA:10 a=J70Eh1EUuV4A:10 a=zSv6zi-ZgakA:10 a=BnV6wE_AV8wA:10 a=eQrCS-SpgXYA:10 a=mDV3o1hIAAAA:8 a=I_5RNyk1AAAA:8 a=inoG4m36AAAA:8 a=vXQWILazQIGB-DJFCncA:9 a=QEXdDO2ut3YA:10 a=_FVE-zBwftR9WsbkzFJk:22 a=Eh9yxdLE6B1twWrs3SXz:22 a=_Qgj-RFg6mImvLaOgLPg:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=bWyr8ysk75zN3GCy5bjg:22 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine Feedback-ID: dfw:ctl:res:onyx X-Authed-Username: ZXJpY2JhdmllckBjZW50dXJ5bGluay5uZXQ= Received: from [10.41.66.12] ([10.41.66.12:56806] helo=md02.onyx.dfw.sync.lan) by smtp.centurylink.net (envelope-from ) (ecelerity 3.6.25.56547 r(Core:3.6.25.0)) with ESMTP id 56/3A-13635-CEECA8D5; Tue, 24 Sep 2019 22:20:28 -0400 Date: Tue, 24 Sep 2019 22:20:28 -0400 (EDT) From: Eric Bavier To: Ludovic =?utf-8?Q?Court=C3=A8s?= Message-ID: <1530026973.36474811.1569378028367.JavaMail.zimbra@centurylink.net> In-Reply-To: <87d0fpoc5o.fsf@gnu.org> References: <20190917033730.28806-1-ericbavier@centurylink.net> <87impmtxr9.fsf@ngyro.com> <878sqitxky.fsf@ngyro.com> <87muevl8qm.fsf@gnu.org> <1991034139.35893173.1569290364575.JavaMail.zimbra@centurylink.net> <87a7auqi3x.fsf@gnu.org> <1509023901.36105334.1569334019062.JavaMail.zimbra@centurylink.net> <87d0fpoc5o.fsf@gnu.org> Subject: Re: [bug#37434] [PATCH 1/2] gnu: ghc-megaparsec: Update to 7.0.5. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [65.128.96.128] X-Mailer: Zimbra 8.7.6_GA_1776 (ZimbraWebClient - SAF13 (Linux)/8.7.6_GA_1776) Thread-Topic: ghc-megaparsec: Update to 7.0.5. Thread-Index: Zi7y6SbNdjGgeBz7u31Zu25Jswsk6Q== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 37435-done Cc: 37434-done@debbugs.gnu.org, Timothy Sample , 37435-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) ----- On Sep 24, 2019, at 12:08 PM, Ludovic Court=C3=A8s ludo@gnu.org wrote= : > Hi Eric, >=20 > Eric Bavier skribis: >=20 >> From 832529b71c2c5c7e6aa6e88a206c0db65e8a0c2e Mon Sep 17 00:00:00 2001 >> From: Eric Bavier >> Date: Mon, 16 Sep 2019 22:20:23 -0500 >> Subject: [PATCH] gnu: idris: Update to 1.3.2. >> >> * gnu/packages/idris.scm (ghc-network-2.8, ghc-megaparsec-7): New variab= les. >> (idris): Update to 1.3.2. >> [source]: Remove patch. >> [inputs]: Use ghc-network-2.8 and ghc-megaparsec-7. >> * gnu/packages/patches/idris-test-no-node.patch: Delete. >> * gnu/local.mk (dist_patch_DATA): Remove it. >=20 > [...] >> +;;; Until we update our default GHC to >=3D8.6 we cannot update our ghc= -network >> +;;; package, since the 'cabal-install' package that supports the curren= t >> +;;; 'Cabal' module requires 'network=3D=3D2.6.*'. Providing a local gh= c-network >> +;;; works in this case since we use it only for a standalone program. >> +(define ghc-network-2.8 >> + (package >> + (inherit ghc-network) >=20 > You should only inherit from packages defined in the same module, > otherwise we risk hitting the dreaded circular dependency mess (actually > this particular case is fine because idris.scm is a =E2=80=9Cleaf=E2=80= =9D, but still, > let=E2=80=99s not take this risk.) >=20 > So I recommend moving these two ghc-* packages next to their friends. Makes sense. Done. > With this change the patch LGTM. Pushed with that change and other small adjustments for latest master in co= mmit 4780db2c93. --=20 `~Eric ------------=_1569378063-15880-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 17 Sep 2019 03:37:16 +0000 Received: from localhost ([127.0.0.1]:51451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iA4Ig-0000ha-8D for submit@debbugs.gnu.org; Mon, 16 Sep 2019 23:37:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:47362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iA4IZ-0000hM-Ai for submit@debbugs.gnu.org; Mon, 16 Sep 2019 23:37:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50906) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iA4IX-0006z4-OV for guix-patches@gnu.org; Mon, 16 Sep 2019 23:37:03 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: *** X-Spam-Status: No, score=3.6 required=5.0 tests=BAYES_50,FREEMAIL_FROM, KHOP_HELO_FCRDNS,SPOOFED_FREEMAIL,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iA4IW-0004TK-2l for guix-patches@gnu.org; Mon, 16 Sep 2019 23:37:01 -0400 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:5206 helo=smtp.centurylink.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iA4IV-0004Rz-UE for guix-patches@gnu.org; Mon, 16 Sep 2019 23:37:00 -0400 DKIM-Signature: v=1; a=rsa-sha1; d=centurylink.net; s=ctl201402; c=relaxed/simple; q=dns/txt; i=@centurylink.net; t=1568691419; h=From:Subject:Date:To:MIME-Version; bh=w9dbhvDgxWduH8QuWZPgaAf3q+c=; b=1QA2uTIVCEHA5ostvY8q/8wTpxzSacj5FeOCtcW4n9vRs30wE861KVLGynDnC/Ce 7vzQV8a/Oq98qr2CcMIPFy5KpY0u6Ygctdw3ALkTzczrf8XjOv9YvYDKvVIBJKjz Xk6e8wiLrFrZL4Es3O4+EvjAQhEHQ0tfVdXE9g8KHPhLt4yHegzUX4BLC4jBv4EQ 9d5JQGHafqrRTdXBWuJvGvNRofdaPEYNzl4bOHTvz5fHpSR7h8B5yESpqy+lWhnZ v1DyIxPJQFArsjHNRAoDMUKNM2sx85TnxGcZmeW74d1fwXGSBEU9zDQIYPXn4iGg cnNkZufFZJJowP2TarlesA==; X_CMAE_Category: , , X-CNFS-Analysis: v=2.3 cv=fqKim2wf c=1 sm=1 tr=0 a=GVJ9LTFkbBq9teHl4Ync7A==:117 a=GVJ9LTFkbBq9teHl4Ync7A==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=KGjhK52YXX0A:10 a=J70Eh1EUuV4A:10 a=zSv6zi-ZgakA:10 a=eQrCS-SpgXYA:10 a=inoG4m36AAAA:8 a=JqsHG6aPAAAA:8 a=bCN-XRSCAAAA:8 a=z6RlEaGRQXJI5Tz_PNAA:9 a=_Qgj-RFg6mImvLaOgLPg:22 a=qfbbBrErdq5vOlahl-QS:22 a=VFraTkD3lrpmuGUt5nhW:22 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine Feedback-ID: dfw:ctl:res:onyx X-Authed-Username: ZXJpY2JhdmllckBjZW50dXJ5bGluay5uZXQ= Authentication-Results: smtp04.onyx.dfw.sync.lan smtp.user=ericbavier@centurylink.net; auth=pass (LOGIN) Received: from [65.128.96.128] ([65.128.96.128:59530] helo=localhost.localdomain) by smtp.centurylink.net (envelope-from ) (ecelerity 3.6.25.56547 r(Core:3.6.25.0)) with ESMTPSA (cipher=DHE-RSA-AES128-GCM-SHA256) id E9/86-30260-BD4508D5; Mon, 16 Sep 2019 23:36:59 -0400 From: ericbavier@centurylink.net To: guix-patches@gnu.org Subject: [PATCH 2/2] gnu: idris: Update to 1.3.2. Date: Mon, 16 Sep 2019 22:37:30 -0500 Message-Id: <20190917033730.28806-2-ericbavier@centurylink.net> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190917033730.28806-1-ericbavier@centurylink.net> References: <20190917033730.28806-1-ericbavier@centurylink.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 206.152.134.66 X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Eric Bavier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) From: Eric Bavier * gnu/packages/idris.scm (ghc-network-2.8): New variable. (idris): Update to 1.3.2. [source]: Remove patch. [inputs]: Use ghc-network-2.8. * gnu/packages/patches/idris-test-no-node.patch: Delete. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/idris.scm | 24 ++++++-- gnu/packages/patches/idris-test-no-node.patch | 61 ------------------- 3 files changed, 20 insertions(+), 66 deletions(-) delete mode 100644 gnu/packages/patches/idris-test-no-node.patch diff --git a/gnu/local.mk b/gnu/local.mk index 16b63bc951..4beee88e38 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -946,7 +946,6 @@ dist_patch_DATA = \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ - %D%/packages/patches/idris-test-no-node.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 4290d8c21f..376db9cb05 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -35,10 +35,27 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages)) +;;; Until we update our default GHC to >=8.6 we cannot update our ghc-network +;;; package, since the 'cabal-install' package that supports the current +;;; 'Cabal' module requires 'network==2.6.*'. Providing a local ghc-network +;;; works in this case since we use it only for a standalone program. +(define ghc-network-2.8 + (package + (inherit ghc-network) + (version "2.8.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/network/" + "network-" version ".tar.gz")) + (sha256 + (base32 + "0im8k51rw3ahmr23ny10pshwbz09jfg0fdpam0hzf2hgxnzmvxb1")))))) + (define-public idris (package (name "idris") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (string-append @@ -46,8 +63,7 @@ "idris-" version "/idris-" version ".tar.gz")) (sha256 (base32 - "0fn9h58l592j72njwma1ia48h8h87wi2rjqfxs7j2lfmvgfv18fi")) - (patches (search-patches "idris-test-no-node.patch")))) + "0wychzkg0yghd2pp8fqz78vp1ayzks191knfpl7mhh8igsmb6bc7")))) (build-system haskell-build-system) (native-inputs ;For tests `(("perl" ,perl) @@ -72,7 +88,7 @@ ("ghc-ieee754" ,ghc-ieee754) ("ghc-libffi" ,ghc-libffi) ("ghc-megaparsec" ,ghc-megaparsec) - ("ghc-network" ,ghc-network) + ("ghc-network" ,ghc-network-2.8) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-safe" ,ghc-safe) diff --git a/gnu/packages/patches/idris-test-no-node.patch b/gnu/packages/patches/idris-test-no-node.patch deleted file mode 100644 index c04ad41a8e..0000000000 --- a/gnu/packages/patches/idris-test-no-node.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 6c52e1b902b869c25e2fe39cff6364143a04da61 Mon Sep 17 00:00:00 2001 -From: Niklas Larsson -Date: Tue, 11 Dec 2018 19:56:22 +0100 -Subject: [PATCH] Only check for Node when required - ---- - test/TestRun.hs | 34 ++++++++++++++++++++-------------- - 1 file changed, 20 insertions(+), 14 deletions(-) - -diff --git a/test/TestRun.hs b/test/TestRun.hs -index c7db9fdcd..4809911f3 100644 ---- a/test/TestRun.hs -+++ b/test/TestRun.hs -@@ -11,6 +11,7 @@ import Data.Proxy - import Data.Typeable - import Options.Applicative - import System.Directory -+import System.Environment - import System.Exit - import System.FilePath (()) - import System.Info -@@ -103,20 +104,25 @@ runTest path flags = do - normalise (x : xs) = x : normalise xs - normalise [] = [] - -+checkNode :: IO () -+checkNode = do -+ nodePath <- findExecutable "node" -+ nodejsPath <- findExecutable "nodejs" -+ let node = nodePath <|> nodejsPath -+ case node of -+ Nothing -> do -+ putStrLn "For running the test suite against Node, node must be installed." -+ exitFailure -+ Just _ -> return () -+ - main :: IO () - main = do -- nodePath <- findExecutable "node" -- nodejsPath <- findExecutable "nodejs" -- let node = nodePath <|> nodejsPath -- case node of -- Nothing -> do -- putStrLn "For running the test suite against Node, node must be installed." -- exitFailure -- Just _ -> do -- defaultMainWithIngredients ingredients $ -+ args <- getArgs -+ when ("--node" `elem` args) checkNode -+ defaultMainWithIngredients ingredients $ - askOption $ \(NodeOpt node) -> -- let (codegen, flags) = if node then (JS, ["--codegen", "node"]) -- else (C , []) -- in -- mkGoldenTests (testFamiliesForCodegen codegen) -- (flags ++ idrisFlags) -+ let (codegen, flags) = if node then (JS, ["--codegen", "node"]) -+ else (C , []) -+ in -+ mkGoldenTests (testFamiliesForCodegen codegen) (flags ++ idrisFlags) -+ -- 2.23.0 ------------=_1569378063-15880-1--