From patchwork Tue Sep 17 03:37:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Bavier X-Patchwork-Id: 15399 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 4C036173EA; Tue, 17 Sep 2019 04:38:13 +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 E3C59173E7 for ; Tue, 17 Sep 2019 04:38:12 +0100 (BST) Received: from localhost ([::1]:41678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iA4Jg-00075m-H0 for patchwork@mira.cbaines.net; Mon, 16 Sep 2019 23:38:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51009) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iA4JY-00073Y-RK for guix-patches@gnu.org; Mon, 16 Sep 2019 23:38:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iA4JX-0004sL-2Q for guix-patches@gnu.org; Mon, 16 Sep 2019 23:38:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42632) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iA4JW-0004sG-Vu for guix-patches@gnu.org; Mon, 16 Sep 2019 23:38:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iA4JW-0000ix-SV for guix-patches@gnu.org; Mon, 16 Sep 2019 23:38:02 -0400 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 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 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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: Eric Bavier Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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) -+