From patchwork Tue Sep 24 14:06:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Bavier X-Patchwork-Id: 15448 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 3B6641742D; Tue, 24 Sep 2019 16:18:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9BF6A1741F for ; Tue, 24 Sep 2019 16:18:55 +0100 (BST) Received: from localhost ([::1]:46944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCmac-0004yp-Ua for patchwork@mira.cbaines.net; Tue, 24 Sep 2019 11:18:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37175) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iClU4-00039O-KD for guix-patches@gnu.org; Tue, 24 Sep 2019 10:08:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iClU2-0004vU-Nu for guix-patches@gnu.org; Tue, 24 Sep 2019 10:08:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59189) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iClU2-0004vL-K3 for guix-patches@gnu.org; Tue, 24 Sep 2019 10:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iClU2-0005Al-CY for guix-patches@gnu.org; Tue, 24 Sep 2019 10:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37434] [PATCH 1/2] gnu: ghc-megaparsec: Update to 7.0.5. Resent-From: Eric Bavier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Sep 2019 14:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37434 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 37434-submit@debbugs.gnu.org id=B37434.156933403619830 (code B ref 37434); Tue, 24 Sep 2019 14:08:02 +0000 Received: (at 37434) by debbugs.gnu.org; 24 Sep 2019 14:07:16 +0000 Received: from localhost ([127.0.0.1]:39777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iClTC-00059i-Uw for submit@debbugs.gnu.org; Tue, 24 Sep 2019 10:07:16 -0400 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:41157 helo=smtp.centurylink.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iClT6-000597-T1 for 37434@debbugs.gnu.org; Tue, 24 Sep 2019 10:07:10 -0400 DKIM-Signature: v=1; a=rsa-sha1; d=centurylink.net; s=ctl201402; c=relaxed/simple; q=dns/txt; i=@centurylink.net; t=1569334019; h=From:Subject:Date:To:MIME-Version:Content-Type; bh=HBpbjt8nTBjnyk/w2zSxxjhFdiQ=; b=ET/LN2BxR8AX9xK0GPuME9y1r2Ae2sotQGqef+y+OUe/HX69RjfKwFxTMUQ689V3 uGFFAH02Bx6YxlYbtXMO4BSmoehsytvcZaKhEYVCoN/TpMh+DUmogWKTKzyP7H5j bnIeHgVZxhQJVmm/ciPP88O3IQMR0yez3JR8iOODSXshnD2H3BNu7Rbm3Qh2z8Il /N2LmKM76mM0EVoDrDVh7TgLNWQhL4hYFe70FtMCG0hVdd+DBhf7bUnx6PbknmMq vxJ8jATzvOsa2TrhpT77FyqNMJRK19z7XplOc334X0T6Pzf6/MRDFG7rEEEKOHYE mEvSOI/b0Qkxu0GfbEoQqA==; X_CMAE_Category: , , X-CNFS-Analysis: v=2.3 cv=LaBCFQXi c=1 sm=1 tr=0 a=FxtcyOs4PmkOA5Srhkhsow==:117 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=KGjhK52YXX0A:10 a=FKkrIqjQGGEA:10 a=OKXshHjYWGYA:10 a=J70Eh1EUuV4A:10 a=zSv6zi-ZgakA:10 a=BnV6wE_AV8wA:10 a=eQrCS-SpgXYA:10 a=mDV3o1hIAAAA:8 a=I_5RNyk1AAAA:8 a=kO2hsywtWQ95mXFO01kA:9 a=QEXdDO2ut3YA:10 a=inoG4m36AAAA:8 a=JqsHG6aPAAAA:8 a=bCN-XRSCAAAA:8 a=CXWgx6G7LvpfcnhEK9gA:9 a=_FVE-zBwftR9WsbkzFJk:22 a=Eh9yxdLE6B1twWrs3SXz:22 a=_Qgj-RFg6mImvLaOgLPg:22 a=qfbbBrErdq5vOlahl-QS:22 a=VFraTkD3lrpmuGUt5nhW:22 a=pHzHmUro8NiASowvMSCR:22 a=xoEH_sTeL_Rfw54TyV31: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.3] ([10.41.66.3:34058] 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 A5/2A-23246-3032A8D5; Tue, 24 Sep 2019 10:06:59 -0400 Date: Tue, 24 Sep 2019 10:06:59 -0400 (EDT) From: Eric Bavier Message-ID: <1509023901.36105334.1569334019062.JavaMail.zimbra@centurylink.net> In-Reply-To: <87a7auqi3x.fsf@gnu.org> References: <20190917033730.28806-1-ericbavier@centurylink.net> <87ftkqpv2l.fsf@gnu.org> <87impmtxr9.fsf@ngyro.com> <878sqitxky.fsf@ngyro.com> <87muevl8qm.fsf@gnu.org> <1991034139.35893173.1569290364575.JavaMail.zimbra@centurylink.net> <87a7auqi3x.fsf@gnu.org> MIME-Version: 1.0 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: pAEDlGRlJVimCVCd1lKO/2zRBPLYZg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 37434 <37434@debbugs.gnu.org>, bavier Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches ----- On Sep 24, 2019, at 2:16 AM, Ludovic Courtès ludo@gnu.org wrote: > Hello, > > Eric Bavier skribis: > >> Idris 1.3.2 unfortunately needs megaparsec>=7.0.4. >> >> FWIW, idris is our only package that depends on ghc-megaparsec. :) So maybe an >> upgrade is fine? > > For the sake of consistency, what about adding a variant of megaparsec > for use by Idris, and keeping the LTS-12 version? That sounds appropriate to me. New patch attached. > >> I was under the impression that our 'guix refresh' updater was supposed to use >> the appropriate stackage version? But it seems to be referencing version 14.6. > > Looking at ‘latest-lts-release’ in (guix import stackage), the updater > seems to just take the latest LTS version. > > We should probably fix that by having the argument to > ‘stackage-lts-info-fetch’ default to the currently targeted LTS version. > Otherwise one has to know the LTS version and pass it to ‘guix import > stackage --lts-version’, which is error-prone. > > Thoughts? I think that would be the right thing to do, imo. 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 variables. (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. --- gnu/local.mk | 1 - gnu/packages/idris.scm | 44 +++++++++++-- gnu/packages/patches/idris-test-no-node.patch | 61 ------------------- 3 files changed, 39 insertions(+), 67 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..39b732482f 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -30,15 +30,50 @@ #:use-module (gnu packages perl) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix git-download) #: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")))))) + +;;; Similarly, Idris 1.3.2 requires 'megaparse>=7.0.4' but we'd like to keep +;;; the public package at the current Stackage LTS version: +(define ghc-megaparsec-7 + (package + (inherit ghc-megaparsec) + (version "7.0.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/megaparsec/" + "megaparsec-" version ".tar.gz")) + (sha256 + (base32 + "0bqx1icbmk8s7wmbcdzsgnlh607c7kzg8l80cp02dxr5valjxp7j")))) + (arguments (strip-keyword-arguments (list #:cabal-revision) + (package-arguments ghc-megaparsec))))) + (define-public idris (package (name "idris") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (string-append @@ -46,8 +81,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) @@ -71,8 +105,8 @@ ("ghc-fsnotify" ,ghc-fsnotify) ("ghc-ieee754" ,ghc-ieee754) ("ghc-libffi" ,ghc-libffi) - ("ghc-megaparsec" ,ghc-megaparsec) - ("ghc-network" ,ghc-network) + ("ghc-megaparsec" ,ghc-megaparsec-7) + ("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